Commit graph

15 commits

Author SHA1 Message Date
Johannes Gäßler
6e0a7e083b Removed the svg source files for textures added by JohannesGaessler 2017-07-06 22:48:48 +02:00
Blood-Asp
8cfd1ff724 Merge pull request #1132 from JohannesGaessler/ItemDistributor
Item Distributor
2017-07-06 22:36:37 +02:00
Johannes Gäßler
72a7a2a4c3 Added a new texture for the Item Distributor 2017-06-30 23:18: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
b73a2e0017 Implemented crafting recipes for the Bricked Blast Furnace
fixed Glass Hammering consuming 40x more energy than intended

Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16
ticks instead of 16EUt, 10 ticks.

Renamed Dense Bricks -> Firebricks
2017-06-17 23:39:51 +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
6d15192990 Implemented Bricked Blast Furnace, added corresponding textures
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID
15

Refactored the non-electric Blast Furnaces:
The Bronze Blast Furnace and the Bricked Blast Furnace extend a
superclass to ensure consistent behavior.
Subclasses only differ in texture, description, and Casing Block.
2017-06-08 23:22:08 +02:00
Johannes Gäßler
c7704610c5 Added Rape Crop as a new source of Seed Oil 2017-06-05 16:50:02 +02:00
Johannes Gäßler
856f1bebbf Changed the NEI GUI of the Distillation Tower to show up to 12 outputs.
Also added a currently unused GUI for 9x9 recipes.
2017-05-16 22:19:36 +02:00
Johannes Gäßler
20142f1b10 Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
2017-05-12 21:12:01 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
ea25cb0355 Tweaked the plastics svg 2017-05-05 21:18:16 +02:00
Johannes Gäßler
5e43252e8a Added a graphic for acids, made the javadoc more descriptive 2017-05-04 22:04:04 +02:00
Johannes Gäßler
26dd5c2af3 Added an svg for misc chemical recipes, tweaked several recipes 2017-05-03 23:38:22 +02:00