github/GT5-Unofficial.git/misc/vector, branch master Unnamed repository; edit this file 'description' to name the repository. Change Canola back to Rape seed (#2464) 2024-01-15T15:25:10+00:00 Caedis Caedis@users.noreply.github.com 2024-01-15T15:25:10+00:00 f2ac9f9aa85d366bb5595d0ec403dab3d98a2439 * Revert "Canola is a better name than Rapeseed (id is staying the same) (#2443)" This reverts commit 2e7625ffed587d930afda7692db0c478e430a8c2. * Only rename visual item name, not internal name * Revert "Only rename visual item name, not internal name" This reverts commit d1a764338344c4871fd12cb4890c38bb1f9ca40b. 
* Revert "Canola is a better name than Rapeseed (id is staying the same) (#2443)"

This reverts commit 2e7625ffed587d930afda7692db0c478e430a8c2.

* Only rename visual item name, not internal name

* Revert "Only rename visual item name, not internal name"

This reverts commit d1a764338344c4871fd12cb4890c38bb1f9ca40b.
 Canola is a better name than Rapeseed (id is staying the same) (#2443) 2024-01-08T19:14:50+00:00 Caedis Caedis@users.noreply.github.com 2024-01-08T19:14:50+00:00 2e7625ffed587d930afda7692db0c478e430a8c2 Canola is a better name than Rapeseed (id is staying the same) 
Canola is a better name than Rapeseed (id is staying the same)
 cherry pick 2017-07-02T09:09:17+00:00 Johannes Gäßler updrn@student.kit.edu 2017-07-01T22:09:48+00:00 67e3b7ddc6e5c7b71e2f9ac5e18c5ca99e075149 Item Distributor #1132 
Item Distributor #1132
Merge remote-tracking branch 'Petrochemy/BrickedBlastFurnace' into BrickedBlastFurnace 2017-06-19T18:23:23+00:00 Dream-Master dream-master@gmx.net 2017-06-19T18:23:23+00:00 6d699a54ccc744088e9ade6de2f17c6a85d8e19d 






Implemented crafting recipes for the Bricked Blast Furnace
2017-06-17T21:39:51+00:00

Johannes Gäßler
updrn@student.kit.edu

2017-06-17T21:39:51+00:00

b73a2e00174e491ca9870524034c3273c68fa5d5

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




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






Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into
2017-06-16T23:02:38+00:00

Johannes Gäßler
updrn@student.kit.edu

2017-06-16T23:02:38+00:00

de42d1da4264bc0dd339020374b45138d8ddb691

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





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







Adjusted BBF GUIs to accommodate to the new 3/3 layout.
2017-06-16T21:48:36+00:00

Johannes Gäßler
updrn@student.kit.edu

2017-06-16T21:48:36+00:00

fcaefe2d2853651f05d83105ee1c7deba104bb9c












Implemented Bricked Blast Furnace, added corresponding textures
2017-06-08T21:22:08+00:00

Johannes Gäßler
updrn@student.kit.edu

2017-06-08T21:22:08+00:00

6d151929908f5a8f30bc04aa0e4cced84e6fb5e5

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.




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.






Oil Cracking Update from Johannes Gaessler
2017-06-06T20:41:10+00:00

Dream-Master
dream-master@gmx.net

2017-06-06T20:41:10+00:00

1a7922a644b5a47902ae37b1ce0bca744dabf4b8












Merge branch 'ChemistryUpdate' into LargeChemicalReactor
2017-05-12T19:12:01+00:00

Johannes Gäßler
updrn@student.kit.edu

2017-05-12T19:12:01+00:00

20142f1b10f06c32be1a5835691c1a89c3888a33

Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java





Conflicts:
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java