Commit graph

466 commits

Author SHA1 Message Date
Dimach
2a672556e6 Added new info to batbuffer sensor card (nuclear control panel) - average input and output.
Also fixed bug in average input/output calculation.
2017-07-30 04:11:56 +03:00
Antifluxfield
26e8f2337f Fix another 2 formulas
S2O => SO2;
S3O => SO3.
2017-07-09 13:08:39 +08:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
2017-07-06 22:36:37 +02:00
Blood-Asp
2ec4a8a8c4 Merge pull request #1135 from JohannesGaessler/InventoryIndexFix
Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
2017-07-06 22:36:14 +02:00
Blood-Asp
2673a6fb86 Merge pull request #1142 from Dimach/miners
Added LV and MV miners.
2017-07-06 22:35:57 +02:00
JohannesGaessler
d2b188025d Merge pull request #1126 from Antifluxfield/PE-polymerization-fix
Trying to fix PE polymerizing recipe
2017-07-06 08:32:16 +02:00
Dimach
424b356fee Added LV and MV miners. 2017-07-06 06:48:18 +03:00
Antifluxfield
8f44019518 Update IGT_RecipeAdder.java 2017-07-03 04:27:06 +08:00
Johannes Gäßler
7d074d985f Accounted for misc slots when shifting machine inventory contents 2017-07-02 17:12:30 +02:00
Johannes Gäßler
5d8bcb0af3 Added a method for calculating total version ID 2017-07-02 01:02:55 +02:00
Johannes Gäßler
a6046ddfad Fixed inventory misalignment when updating 5.09.30 -> 5.09.31
I added a new method to BaseMetaTileEntity that shifts the Inventory
index according to the change in Input/Output slots.

Instrumentally I have added a new version ID that considers the GT
subversion.
2017-07-02 00:09:48 +02:00
Blood-Asp
2385f04b41 Fix cover and mode spelling 2017-07-01 18:14:05 +02:00
Blood-Asp
4fbd38eb0b Merge pull request #1129 from Antifluxfield/PlayerDetector-fix
Player detector fix
2017-07-01 17:35:30 +02:00
Blood-Asp
ebd2d13d7a Merge pull request #1130 from Antifluxfield/AssemblyLine_upgrade
Assembly line upgrade
2017-07-01 17:11:35 +02:00
Blood-Asp
37869e5c6c Merge pull request #1128 from Dimach/oil-fix
Removed divider that already applied in Gt_UndergroundOil.
2017-07-01 17:08:51 +02:00
Johannes Gäßler
b9f8927b3d Made Automation tooltips more descriptive
Adjusted allowPutStack, isInputFacing, isOutputFacing for the Item
Distributor
Adjusted onScrewdriverRightClick for the Item Regulator
2017-07-01 11:29:27 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18:44 +02:00
Antifluxfield
c21e9cfc41 Update IGT_RecipeAdder.java 2017-06-30 11:32:15 +08:00
Antifluxfield
47910b2bfe Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 08:51:58 +08:00
Antifluxfield
8295f740af Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 08:24:38 +08:00
Antifluxfield
9ba12192c8 Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 07:37:33 +08:00
Antifluxfield
5f62601684 Update Textures.java 2017-06-30 07:36:54 +08:00
Antifluxfield
04058ef4e4 Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 06:28:46 +08:00
Antifluxfield
fa486fcd56 Update ItemList.java 2017-06-30 06:19:38 +08:00
Antifluxfield
348c6b801c Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 06:18:30 +08:00
Antifluxfield
cf9d888745 Update GT_GUIContainer_1by1.java 2017-06-30 06:11:42 +08:00
Antifluxfield
44ad1bcb96 Update GT_GUIContainer_2by2.java 2017-06-30 06:11:18 +08:00
Antifluxfield
08d45ae407 Update GT_GUIContainer_3by3.java 2017-06-30 06:10:31 +08:00
Antifluxfield
94bf4937d8 Update GT_GUIContainer_4by4.java 2017-06-30 06:09:28 +08:00
Antifluxfield
a2bd69d2da Delete GT_GUIContainer_DataAccess.java 2017-06-30 06:08:28 +08:00
Antifluxfield
81b91a3d7e Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 05:45:37 +08:00
Antifluxfield
37d8191bdc Update GT_MetaTileEntity_MultiBlockBase.java 2017-06-30 05:17:12 +08:00
Antifluxfield
1a78d7f315 Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 04:48:28 +08:00
Antifluxfield
dd1f4f7a3e Create GT_GUIContainer_DataAccess.java 2017-06-30 04:47:21 +08:00
Antifluxfield
5294b864bd Update GT_MetaTileEntity_Hatch_DataAccess.java 2017-06-30 04:24:45 +08:00
Antifluxfield
5995a20bb6 Check for DataItems 2017-06-30 03:52:51 +08:00
Antifluxfield
41a0e6d8a0 Make Data Access Hatch a MultiBlock part 2017-06-30 02:49:39 +08:00
Antifluxfield
ac74f55c2a Adding Data Access Hatch 2017-06-30 01:33:37 +08:00
Antifluxfield
d6625b0431 Adding Data Access Hatch 2017-06-29 12:31:50 -05:00
Dimach
4d471edc8f Done 2017-06-29 19:23:44 +03:00
Antifluxfield
d50682ff7f Player Detector fix #2 2017-06-29 19:03:15 +08:00
Antifluxfield
3e566dc404 Trying to fix #1112
A simple duct-tape of this issue.
2017-06-29 17:50:51 +08:00
Antifluxfield
477e2b5a6d Fixed 2 formulae
TiC2Cl2 => TiCl4;
HPO4    => H3PO4.
2017-06-28 08:46:38 +08:00
Johannes Gäßler
4061f8f397 Corrected Plutonium Isotope: 244 -> 239 2017-06-27 09:33:35 +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
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25 23:45:45 +02:00
Johannes Gäßler
18f5945d80 Merge branch 'OilRefining' into unstable
Conflicts:
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-06-25 23:34:30 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
Technus
9beb1b5b31 Assline recipes part1 2017-06-25 11:42:48 +02:00
Daniel
b7a339d63e Revert "NEI GUI AssemblyLine" 2017-06-25 10:42:39 +02:00