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

316 commits

Author SHA1 Message Date
Johannes Gäßler
af36dd3099 Fixed a bug where every Fluid was put out at the top of the EBF 2017-07-27 22:44:33 +02:00
Johannes Gäßler
306160fb69 Implemented Fluid Output for the EBF 
Regular Fluids are put out at the bottom layer.
CO2, CO, and SO2 are put out at the top layer and their amount scales
with the tier of the EBF's Muffler Hatch
 2017-07-24 11:14:52 +02:00
Johannes Gäßler
fff1f594fb Added the Large Chemical Reactor Controller inventory to the item input 2017-07-17 20:08:47 +02:00
Johannes Gäßler
da2e748e8a Fixed Item Distributor causing an OutOfboundsException for invalid NBT. 2017-07-09 23:14:30 +02:00
Blood-Asp
f657b3d0c6 Fix Pyrooven textures 2017-07-06 23:16:26 +02:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor 
Item Distributor
 2017-07-06 22:36:37 +02:00
Dimach
480132b25f Changed miner rates. 2017-07-06 17:56:43 +03:00
Dimach
0375e11deb Changed MV miner radius. 2017-07-06 14:35:33 +03:00
Dimach
0334a19993 Changed miner mechanics and rates. 2017-07-06 13:42:45 +03:00
Dimach
98e214b873 Fixed NBT bug in OreDrillingPlant. 2017-07-06 11:14:40 +03:00
Dimach
835dd2dacc Changed naming of constants. 2017-07-06 11:13:32 +03:00
Dimach
424b356fee Added LV and MV miners. 2017-07-06 06:48:18 +03:00
Blood-Asp
026fcfcbba Clean reset of Datastick so remaining old data does not break assemblyline. 2017-07-01 17:50:27 +02:00
Blood-Asp
ebd2d13d7a Merge pull request #1130 from Antifluxfield/AssemblyLine_upgrade 
Assembly line upgrade
 2017-07-01 17:11:35 +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
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
e1aafccce5 Added ItemDistributor crafting recipes, reordered ItemDistributor fields 2017-07-01 00:12:34 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18:44 +02:00
Antifluxfield
3e2fdcc760 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 08:44:30 +08:00
Antifluxfield
03bb774498 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 08:35:49 +08:00
Antifluxfield
b1a29c3a22 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 08:24:35 +08:00
Antifluxfield
e4b584af79 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 05:46:39 +08:00
Antifluxfield
7933d041c7 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 05:02:50 +08:00
Antifluxfield
a0a596e387 Update GT_MetaTileEntity_AssemblyLine.java 2017-06-30 04:43:48 +08:00
Antifluxfield
53ca200a2e Make Data Access Hatch part of AssLine 2017-06-30 02:53:17 +08:00
Dimach
c145af0327 Removed divider that already applied in Gt_UndergroundOil. 2017-06-29 06:25:57 +03:00
Johannes Gäßler
6a9e0756d6 Fixed a bug where the Bricked Blast Furnace didn't need a casing. 
I forgot to actually implement checking whether the casing blocks are
Firerick blocks.
 2017-06-29 00:29:06 +02:00
Johannes Gäßler
40d850aece Added the state of the ItemDistributor to the NBTTadCompound 2017-06-28 00:16:04 +02:00
Johannes Gäßler
95a1d46086 Added configurable weights to the ItemDistributor sides. 2017-06-27 00:44:59 +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
eb4768ba0c Fixed typo: Firerick -> Firebrick 2017-06-26 09:05:44 +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
Johannes Gäßler
22fdaed164 Added simple ItemDistributor implementation, changed MoveOneItemStack 2017-06-25 00:30:59 +02:00
Johannes Gäßler
31516ba891 Created a non-functional first draft of the Item Distributor 2017-06-24 18:08:23 +02:00
Johannes Gäßler
c0c498fb8c Added Bricked BF config, fixed Primitive BF class hierarchy 
Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
 2017-06-23 23:48:38 +02:00
Johannes Gäßler
14b9332d14 Moved the Casings for the Large Chemical Reactor again. 
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea
because even though there is no actual Casing at those IDs, the textures
are in use.

I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127.
I did not use IDs 80-95 because there seem to already be some textures
there.
I did not use IDs 96-111 because they seem to already be in use by
Technus.
 2017-06-22 01:50:21 +02:00
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
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
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
b3e0b41ee6 Changed the Primitive Blast Furnace so that it uses the new Recipe Map 2017-06-11 18:52:08 +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