Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.09.30] Bricked Blast Furnace #1099

Merged
merged 8 commits into from Jun 25, 2017
Merged

[5.09.30] Bricked Blast Furnace #1099

merged 8 commits into from Jun 25, 2017

Commits on Jun 8, 2017

  1. 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.
    Johannes Gäßler committed Jun 8, 2017
    Copy the full SHA
    6d15192 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2017

  1. Added a Recipe Map for Primitive Blast Furnaces 

    The Recipe Map is not yet in use.
    Johannes Gäßler committed Jun 10, 2017
    Copy the full SHA
    7982374 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. Changed the Primitive Blast Furnace so that it uses the new Recipe Map

    Johannes Gäßler committed Jun 11, 2017
    Copy the full SHA
    b3e0b41 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. Added Interface classes for the BBF, increased slots to 3/3

    Johannes Gäßler committed Jun 16, 2017
    Copy the full SHA
    da83199 View commit details
    Browse the repository at this point in the history

  2. Adjusted BBF GUIs to accommodate to the new 3/3 layout.

    Johannes Gäßler committed Jun 16, 2017
    Copy the full SHA
    fcaefe2 View commit details
    Browse the repository at this point in the history

  3. 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
    Johannes Gäßler committed Jun 16, 2017
    Copy the full SHA
    de42d1d View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2017

  1. 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
    Johannes Gäßler committed Jun 17, 2017
    Copy the full SHA
    b73a2e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Added Bricked BF config, fixed Primitive BF class hierarchy 

    Blast Furnace Recipes using Coal or Charcoal now yield Dark Ash instead
of Ash.
    Johannes Gäßler committed Jun 23, 2017
    Copy the full SHA
    c0c498f View commit details
    Browse the repository at this point in the history