Blood-Asp
|
8cfd1ff724
|
Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
|
2017-07-06 22:36:37 +02:00 |
|
Johannes Gäßler
|
baa04cc51b
|
Added GUI classes for the Item Distributor, fixed EU IO logic
|
2017-07-01 13:01:11 +02:00 |
|
Johannes Gäßler
|
ddf58e6ef4
|
Merge branch 'unstable_blood' into unstable
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-26 20:25:32 +02:00 |
|
Technus
|
6abdc95c0c
|
Optimize imports - intelliJ one button action
|
2017-06-25 12:09:46 +02:00 |
|
Johannes Gäßler
|
de42d1da42
|
Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
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-17 01:02:38 +02:00 |
|
Johannes Gäßler
|
fcaefe2d28
|
Adjusted BBF GUIs to accommodate to the new 3/3 layout.
|
2017-06-16 23:48:36 +02:00 |
|
Johannes Gäßler
|
da83199523
|
Added Interface classes for the BBF, increased slots to 3/3
|
2017-06-16 21:26:20 +02:00 |
|
Blood-Asp
|
c1f85264a0
|
Add missing translation lines. #772
|
2017-06-05 20:45:15 +02:00 |
|
Blood-Asp
|
7c67f95c93
|
Small fusion reactor fixes
|
2017-03-23 13:59:16 +01:00 |
|
Dimach
|
76e82ed355
|
Implement #292.
|
2017-03-15 04:51:15 +02:00 |
|
Muramasa
|
7874d1c91f
|
Bugfixes 8
|
2016-08-14 08:06:00 +01:00 |
|
Muramasa
|
1abb196a2f
|
Bugfixes 5 fix: Removed commented code
|
2016-08-14 07:32:19 +01:00 |
|
Muramasa
|
f94313e9b1
|
Bugfixes 6 fix: Removed commented code
|
2016-08-14 07:24:57 +01:00 |
|
Muramasa
|
e85097319b
|
Bugfixes 7
|
2016-08-14 07:19:03 +01:00 |
|
Muramasa
|
19062e1d36
|
Bugfixes 6
|
2016-08-14 05:56:41 +01:00 |
|
Muramasa
|
bfccecf87b
|
Bugfixes 5
|
2016-08-14 05:36:12 +01:00 |
|
Blood-Asp
|
40324b05f9
|
Fixed ItemFiler OpenGL error.
|
2015-11-01 14:09:18 +01:00 |
|
Shawn Buckley
|
9353aa711b
|
Reformat code
|
2015-10-21 22:06:25 -04:00 |
|
Shawn Buckley
|
c68e84f1e2
|
Remove jdgui-comments
|
2015-10-21 21:11:56 -04:00 |
|
Shawn Buckley
|
bea4cfc545
|
Bring in experimental branch
|
2015-10-21 20:47:13 -04:00 |
|
Shawn Buckley
|
1185424fa7
|
Move source files
|
2015-10-21 20:46:52 -04:00 |
|