aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui
AgeCommit message (Collapse)Author
2017-07-06Merge pull request #1132 from JohannesGaessler/ItemDistributorBlood-Asp
Item Distributor
2017-07-01Added GUI classes for the Item Distributor, fixed EU IO logicJohannes Gäßler
2017-06-26Merge branch 'unstable_blood' into unstableJohannes Gäßler
Conflicts: src/main/java/gregtech/api/enums/MaterialBuilder.java src/main/java/gregtech/common/GT_RecipeAdder.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25Optimize imports - intelliJ one button actionTechnus
2017-06-17Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' intoJohannes Gäßler
BrickedBlastFurnace Conflicts: src/main/java/gregtech/api/enums/Materials.java src/main/java/gregtech/api/enums/Textures.java src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-16Adjusted BBF GUIs to accommodate to the new 3/3 layout.Johannes Gäßler
2017-06-16Added Interface classes for the BBF, increased slots to 3/3Johannes Gäßler
2017-06-05Add missing translation lines. #772Blood-Asp
2017-03-23Small fusion reactor fixesBlood-Asp
2017-03-15Implement #292.Dimach
2016-08-14Bugfixes 8Muramasa
2016-08-14Bugfixes 5 fix: Removed commented codeMuramasa
2016-08-14Bugfixes 6 fix: Removed commented codeMuramasa
2016-08-14Bugfixes 7Muramasa
2016-08-14Bugfixes 6Muramasa
2016-08-14Bugfixes 5Muramasa
2015-11-01Fixed ItemFiler OpenGL error.Blood-Asp
2015-10-21Reformat codeShawn Buckley
2015-10-21Remove jdgui-commentsShawn Buckley
2015-10-21Bring in experimental branchShawn Buckley
2015-10-21Move source filesShawn Buckley