Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-06-18 | Merge branch 'ChemistryUpdate' into unstable | Johannes Gäßler | |
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-15 | Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate | Johannes Gäßler | |
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-07 | Merge branch 'unstable' into advminer2_improvements | Techlone | |
# Conflicts: # src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java | |||
2017-06-04 | wire/pipe hiding/reduced size | Technus | |
2017-06-01 | Fix OreDrill; fix getting block in ItemList; some changes in addInformation ↵ | Techlone | |
- need check this | |||
2017-06-01 | AdvMiner rewriting; now it's Ore Drilling Plant | Techlone | |
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-05-09 | Added new textures for the LCM, using them now | Johannes Gäßler | |
2017-05-08 | Implemented checkMachine for the LCR, added machine casings | Johannes Gäßler | |
2017-02-11 | Finish Cleanroom | Blood-Asp | |
2016-07-26 | Restored TextureSets | OneEyeMaker | |
2016-07-26 | Fixed merge conflicts. | OneEyeMaker | |
2016-07-26 | Coils should be deprecated | OneEyeMaker | |
2016-07-21 | Redefined some wires. Added last heating coil block. | OneEyeMaker | |
2016-07-20 | Added new tier of heating coils. | OneEyeMaker | |
//TODO: Find material for LuV coils. | |||
2016-07-18 | Restored broken compatibility. | OneEyeMaker | |
2016-07-18 | Moved all coils to another block. | OneEyeMaker | |
2016-07-17 | Added new heating coil blocks. | OneEyeMaker | |
2016-05-20 | Basically a rewrite | Muramasa | |
2016-04-19 | Missed a file | Muramasa | |
2016-04-17 | Revert "Turbine Rebalance" | Muramasa | |
This reverts commit ddc0c4299e8d3c703b6b93f876ce38f961d08236. | |||
2016-04-17 | Turbine Rebalance | Muramasa | |
Added 3 new turbine casings to rebalance the turbines. Also changed turbine controller recipes to fit the rebalance. Large Steam: Steel Turbine Casing Large HP Steam Turbine: Stainless Steel Turbine Casing Large Gas Turbine: Steel Turbine Casing Large Diesel Turbine: Titanium Turbine Casing Large Plasma Turbine: Tungstensteel Turbine Casing | |||
2015-10-21 | Reformat code | Shawn Buckley | |
2015-10-21 | Bring in experimental branch | Shawn Buckley | |
2015-10-21 | Move source files | Shawn Buckley | |