Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1136 commits 8 branches 203 tags 97 MiB
Commit graph

1136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Technus
9beb1b5b31 Assline recipes part1 2017-06-25 11:42:48 +02:00
Blood-Asp
a6ccb120e1 Merge pull request #1117 from Technus/revert-1115-assline 
Revert "NEI GUI AssemblyLine"
 2017-06-25 11:13:11 +02:00
Daniel
b7a339d63e Revert "NEI GUI AssemblyLine" 2017-06-25 10:42:39 +02:00
Johannes Gäßler
3093ef1b13 Made the Large Chemical Reactor cheaper, added more Cell Materials 
Large Chemical Reactor Circuits: Elite -> Advanced
Inert Machine Casing: Clean Stainless Steel Casing -> Solid Steel Casing

Fluid Cells can now also be made from Steel and Polytetrafluoroethylene

Fixed the name of Plastic and PTFE Fluid Pipes.
 2017-06-24 17:26:57 +02:00
Johannes Gäßler
4b77ca6713 Added more recipes for Carbon Monoxide, Carbon Dioxide, Acetic Acid 2017-06-24 13:59:27 +02:00
Blood-Asp
484b45466a Merge pull request #1115 from SLiMylya/assline 
NEI GUI AssemblyLine
 2017-06-24 11:25:42 +02:00
SLiMylya
cbefd59741 NEI GUI AssemblyLine 2017-06-24 09:51:59 +03:00
Johannes Gäßler
41b93ae85d Fixed several Material formulas 
RedAlloy, TungstenCarbide now have the correct formula.
Changed the formula of Lignite, it no longer contains Ash

Fixed the algorithm for determining whether or not to put brackets
around a partial Material.
 2017-06-23 00:54:16 +02:00
Johannes Gäßler
14b9332d14 Moved the Casings for the Large Chemical Reactor again. 
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea
because even though there is no actual Casing at those IDs, the textures
are in use.

I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127.
I did not use IDs 80-95 because there seem to already be some textures
there.
I did not use IDs 96-111 because they seem to already be in use by
Technus.
 2017-06-22 01:50:21 +02:00
Johannes Gäßler
337b6fc66d Merge branch 'ChemistryUpdate' into unstable 
Conflicts:
	src/main/java/gregtech/api/enums/ItemList.java
	src/main/java/gregtech/api/enums/Textures.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-18 00:17:03 +02:00
Blood-Asp
edc857c8a9 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-17 14:38:20 +02:00
Blood-Asp
617f057dad Extended logging for Assemblyline 2017-06-17 14:37:57 +02:00
Blood-Asp
909149cd28 Merge pull request #1074 from Techlone/advminer2_improvements 
AdvMiner2 renamed; new tiers of OreDrillingPlant
 2017-06-17 14:37:10 +02:00
Blood-Asp
b588e82ef7 Fix buffer and regulator RS signals 2017-06-16 01:40:16 +02:00
Blood-Asp
810e46d753 fix naquadah wafer recipe #1094 2017-06-15 23:58:54 +02:00
Blood-Asp
a1e3a8161e Hitboxes when holding soldering iron #1095 2017-06-15 23:52:32 +02:00
Blood-Asp
650a105e00 Fix hiding of unused ores. #1062 2017-06-15 23:49:16 +02:00
Johannes Gäßler
34474480f7 Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate 
Conflicts:
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
 2017-06-15 12:28:14 +02:00
Johannes Gäßler
c3f2b2b49d Made it so that Pyrolyse Oven recipes are consistent 
Moved Pyrolyse Oven recipes with Charcoal Byproducts, Wood Gas, Wood
Vinegar, or Wood Tar to OreProcessing to ensure that all log types can
be used.
 2017-06-15 10:27:06 +02:00
Blood-Asp
08c75fd813 Improve fog density calculation 2017-06-15 00:28:27 +02:00
Blood-Asp
911a807529 pollution smog 2017-06-14 23:51:39 +02:00
Johannes Gäßler
3cb5ec51cf Fixed Allyl Chloride recipe consuming a Fluid Cell 2017-06-14 22:06:38 +02:00
Blood-Asp
6b4b32200d fix IC Classic compat #1090 2017-06-14 20:47:42 +02:00
Blood-Asp
b15f0d2c0b Merge pull request #1091 from draknyte1/unstable 
Made the Cleanroom optional.
 2017-06-14 13:47:08 +02:00
Draknyte1
d1eea59fe7 Made the Cleanroom optional. 
This disables the Low Grav option if the Cleanroom is disabled.
 2017-06-14 18:55:26 +10:00
Blood-Asp
96b1cb31ce improve cleanroom tooltip 2017-06-14 02:16:18 +02:00
Blood-Asp
e6de8921c0 fix for timber changes 2017-06-14 01:30:36 +02:00
Blood-Asp
c397df4523 make reinforced blocks prevent monsterspawns 2017-06-14 01:19:56 +02:00
Blood-Asp
9447eea43b why does the client crash when using isClientSide() ??? 2017-06-14 01:02:49 +02:00
Blood-Asp
61d17d250d quickfix for server side crash 2017-06-14 00:00:58 +02:00
Blood-Asp
e30a5694ff wood plank compressor recipe #1013 2017-06-13 23:10:49 +02:00
Blood-Asp
4ac668066b missed one file 2017-06-13 22:50:19 +02:00
Blood-Asp
699ea26ba4 Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect. 2017-06-13 22:41:15 +02:00
Blood-Asp
3caab8d4ff Fix translation of covers 2017-06-13 21:48:10 +02:00
Blood-Asp
9209d0843f Port GT6 timber changes 2017-06-13 18:58:18 +02:00
Blood-Asp
ead3fa6ad7 meh... 2017-06-13 18:57:05 +02:00
Blood-Asp
c665b14e22 Merge pull request #1088 from Techlone/reworking_dataorb 
Reworking DataOrb and DataStick
 2017-06-13 18:55:33 +02:00
Techlone
156bb2b06b Tooltips changing 2017-06-13 21:09:48 +05:00
Techlone
1b753d3528 Reworking DataOrb and DataStick 2017-06-13 20:52:53 +05:00
Techlone
c8a8687a72 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-13 17:44:23 +05:00
Techlone
bfd3ff4b19 Merge branch 'unstable' of https://github.com/Techlone/GT5-Unofficial into unstable 2017-06-13 17:44:13 +05:00
Blood-Asp
e85a761e82 At last one free face. 2017-06-12 13:48:54 +02:00
Blood-Asp
ef22bf6ab9 Only open machine gui if front is free. 2017-06-12 12:18:54 +02:00
Blood-Asp
8e043d00d9 Cables and pipes now change hitboxes dynamicly depending on connections or covers 2017-06-12 11:58:26 +02:00
Blood-Asp
e0cd4376b1 change back the component heat exchanger damage value 2017-06-12 11:34:25 +02:00
Johannes Gäßler
c9277a3a7e Fixed Chloromethane and Chloroform recipes missing empty cell outputs 2017-06-12 00:33:42 +02:00
Blood-Asp
30b6d22d81 Merge pull request #1083 from Techlone/unstable 
More fixes for the world gen
 2017-06-10 23:41:41 +02:00
Techlone
d7debfd34e fix wrong center chunk coordinates 2017-06-08 21:27:24 +05:00
Techlone
8172e2ef60 Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable 2017-06-08 20:42:06 +05:00
Blood-Asp
0a375ac948 experimental worldgen change fix 2017-06-07 19:00:15 +02:00