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

273 commits

Author SHA1 Message Date
Johannes Gäßler
668ca431a8 Merge remote-tracking branch 'origin/unstable' into OilRefining 
Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-18 17:26:04 +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
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
Blood-Asp
96b1cb31ce improve cleanroom tooltip 2017-06-14 02:16:18 +02:00
Johannes Gäßler
74c41614a5 Fixed Silicone Rubber recipe, nerfed Silicone Rubber, added DT desc. 
Made it so that GT_Values.NI and GT_Values.NF are consistently used when
applicable.

Nerfed Silicone Rubber so that you only get 3/7 as much as from a
regular plastic.
The idea is that Silicone Rubber is more versatile than PVC or SBR, but
also more expensive.

Changed the Distillation Tower description so that it aligns with the
new behavior.
 2017-06-09 00:14:55 +02:00
Techlone
86318b7b44 Merge branch 'unstable' into advminer2_improvements 
# Conflicts:
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
 2017-06-07 18:17:23 +05:00
Techlone
a19e8b10eb Merge branch 'advminer2_improvements' of https://github.com/Techlone/GT5-Unofficial into advminer2_improvements 2017-06-07 18:14:15 +05:00
Johannes Gäßler
1d636be525 Fixed a bug where the order of DT fluid outputs was actually reversed 2017-06-06 20:27:20 +02:00
Blood-Asp
d9a318678c Correcting Steel Boiler Tooltip #1080 2017-06-06 13:00:11 +02:00
Blood-Asp
4c25e83b0d Improved large boiler tooltip #877 2017-06-05 21:07:23 +02:00
Blood-Asp
c1f85264a0 Add missing translation lines. #772 2017-06-05 20:45:15 +02:00
Techlone
7cb51ae461 fix OsmiridiumCasing recipe in Assembler 
fix ODP changing state when the tip meets itself
fix cleaning of oreBlockPositions when a mining column was broken
 2017-06-05 17:14:24 +05:00
Johannes Gäßler
e42ddd911a Merge branch 'ChemistryUpdate' of https://github.com/JohannesGaessler/GT5-Unofficial into ChemistryUpdate 2017-06-04 20:31:28 +02:00
Johannes Gäßler
d0247a5d73 Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5 
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
 2017-06-04 20:19:07 +02:00
Techlone
5df32b69ab Merge branch 'unstable' into advminer2_improvements 2017-06-04 21:31:08 +05:00
Blood-Asp
23de1f09ed Cleanroom controller outputs efficency as redstone signal #948 2017-06-04 00:26:31 +02:00
Technus
467e6ba022 1ddc91a 2017-06-03 16:11:59 +02:00
Techlone
c5402ee389 Some ODP fixes, energy checking, add radius in tooltip, add "missing pipes" message for II-IV tiers 
change build.gradle for debugging in IDEA
 2017-06-02 22:18:29 +05:00
Techlone
067f4491a8 Merge branch 'unstable' into advminer2_improvements 2017-06-01 20:59:40 +05:00
Techlone
7c48590a49 OreDrill state saving 2017-06-01 20:58:24 +05:00
Techlone
75a33be210 Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this 2017-06-01 20:23:13 +05:00
Blood-Asp
7ddf9c5f4e Teleporter and Energy Transmitter fixes 2017-06-01 13:28:05 +02:00
Technus
a4f0426159 8e0e516 2017-06-01 13:22:10 +02:00
Technus
82458fed2e Cherry-Pick c12e474 
c12e474c23
 2017-06-01 13:18:34 +02:00
Technus
7a08da6a06 that makes it look better? 2017-06-01 12:01:20 +02:00
Technus
427b1e105a Why does one change the machine state TWICE in the same tick... 2017-06-01 12:00:52 +02:00
JohannesGaessler
7eb176f3a2 Merge branch 'unstable' into ChemistryUpdate 2017-06-01 10:22:10 +02:00
Techlone
19f7074897 Merge branch 'unstable' into advminer2_improvements 2017-06-01 00:02:13 +05:00
Techlone
b187410005 AdvMiner rewriting; now it's Ore Drilling Plant 
Four tiers of Ore Drilling Plant
I - radius is 3 chunks MV+ (default)
II - radius is 4 chunks HV+
III - radius is 6 chunks EV+
IV - radius is 9 chunks IV+

New behavior:
- pick pipes after mining finish
- extract ore block before moving down
 2017-06-01 00:01:32 +05:00
Johannes Gäßler
38bfbabd58 Fixed a bug where the LCM could have a mMaxProgressTime of zero. 2017-05-30 10:21:46 +02:00
Johannes Gäßler
c38cc2bc7b Changed the Distillation Tower so that it outputs fluids only at the 
correct levels.

Adjusted existing distillation recipes so that they line up with this
change.
Slightly rebalanced Charcoal Byproducts.
 2017-05-29 00:09:38 +02:00
Johannes Gäßler
4c02055503 Rewrote parts of the Oil Cracker so that it's in line with the new 
recipes
 2017-05-25 18:34:00 +02:00
Johannes Gäßler
6bcdc3d157 Changed the Distillation Tower so that any height from 3 to 12 is 
considered valid.
 2017-05-16 22:16:50 +02:00
Johannes Gäßler
a16ea6bbc7 Changed the Layout of the LCM to 3x3x3, tweaked the name of casings and 
the descriptions of multiblocks to make them consistent.
 2017-05-13 23:08:50 +02:00
Johannes Gäßler
60348c09ba Added a new recipe map for the LCR, expanded the API to allow for custom 
NEI stack positioning.

Refactored the name of the Large Boiler Fake Fuels so they're in line
with other names.
Fixed a bug where the LCM was checking for the wrong casing type.
 2017-05-13 16:37:39 +02:00
Johannes Gäßler
3cf169b5c3 Added crafting recipes for the LCH 2017-05-12 22:50:29 +02:00
Johannes Gäßler
3b681b69d5 Changed multiblocks so they all consider all inputs for finding recipes 2017-05-10 19:56:36 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
ad40b85de1 Implemented checkRecipe 2017-05-09 18:25:24 +02:00
Johannes Gäßler
989f2f2356 Deleted prints used for debugging 2017-05-08 00:12:23 +02:00
Johannes Gäßler
7bc06a3969 Implemented checkMachine for the LCR, added machine casings 2017-05-08 00:11:36 +02:00
Johannes Gäßler
4546f45e3a Created a non-functional first draft for the Large chemical Reactor 2017-05-07 15:36:01 +02:00
Johannes Gäßler
b1e35de06e Reverted erroneous previous commit. 2017-05-07 08:47:24 +02:00
Johannes Gäßler
dc217f66a8 Created a first draft for the Large Chemical Reactor 2017-05-06 21:23:32 +02:00
Johannes Gäßler
0aeab34a56 Fixed the Electric Blast Furnace not recognizing recipes when there is 
more than one Fluid input.

Also added a String representation for GT_FluidStack that was used for
debugging.
 2017-05-06 18:01:06 +02:00
Blood-Asp
e7d8d5ecbe Merge pull request #1025 from JohannesGaessler/SteamProductionImprovement 
Steam production improvement / Tooltip improvement / Pollution adjustment
 2017-04-27 18:26:42 +02:00
Techlone
cae69aa28f Fix eu consumption absence by AssemblyLine and some clean up 2017-04-27 19:35:07 +05:00