GT5-Unofficial/misc/vector
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
..
bricked_blast_furnace_active.svg
bricked_blast_furnace_gui.svg
bricked_blast_furnace_inactive.svg
casing.chemically_inert.svg
casing.pipe_polytetrafluoroethylene.svg Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
chemistry.acids.svg
chemistry.misc.svg
chemistry.plastics.svg
dense_bricks.svg
MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.png