Calclavia 07332ca245 Merge branch 'master' into universal-wires ... Conflicts: common/mekanism/induction/common/MekanismInduction.java resources/assets/mekanism/lang/en_US.lang		2013-12-02 19:47:38 +08:00
..
glass	Connected Dynamic Glass textures :)	2013-11-24 19:30:52 -05:00
render	Fixed non-multipart insulated wire texture	2013-12-01 18:05:27 +08:00
AdvancedEnergyCubeFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
AdvancedEnergyCubeSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
AdvancedFactoryFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
AdvancedFactorySide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
AdvancedFactoryTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BasicEnergyCubeFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BasicEnergyCubeSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BasicFactoryFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BasicFactorySide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BasicFactoryTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
BinFront.png	More bin work! :D	2013-11-12 18:42:55 -05:00
BinFrontOn.png	More bin work! :D	2013-11-12 18:42:55 -05:00
BinSide.png	More bin work! :D	2013-11-12 18:42:55 -05:00
BinTop.png	More bin work! :D	2013-11-12 18:42:55 -05:00
BinTopOn.png	More bin work! :D	2013-11-12 18:42:55 -05:00
BronzeBlock.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CoalBlock.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CombinerFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CombinerFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CombinerFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CopperOre.png	Begin work on copper and tin ore and ingots :)	2013-12-01 21:58:35 -05:00
CrusherFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CrusherFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
CrusherFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
DynamicGlass.png	Connected Dynamic Glass textures :)	2013-11-24 19:30:52 -05:00
DynamicTank.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
DynamicValve.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EliteEnergyCubeFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EliteEnergyCubeSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EliteFactoryFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EliteFactorySide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EliteFactoryTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EnergizedSmelterFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EnergizedSmelterFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EnergizedSmelterFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EnrichmentChamberFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
EnrichmentChamberFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
GasTankFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
GasTankSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
GasTankTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
LiquidEnergy.png	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
LiquidEnergy.png.mcmeta	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
LiquidHydrogen.png	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
LiquidHydrogen.png.mcmeta	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
LiquidOxygen.png	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
LiquidOxygen.png.mcmeta	Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup	2013-11-24 12:12:42 -06:00
MetallurgicInfuserBackOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserBackOn.png	Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves.	2013-10-25 00:23:38 -04:00
MetallurgicInfuserBackOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserSideOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserSideOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserSideOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserTopOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
MetallurgicInfuserTopOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
ObsidianTNTBottom.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
ObsidianTNTSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
ObsidianTNTTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OsmiumBlock.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OsmiumCompressorFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OsmiumCompressorFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OsmiumCompressorFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OsmiumOre.png	Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness	2013-12-01 17:45:19 -05:00
OverlayAqua.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayBlack.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayBrightGreen.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayDarkAqua.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayDarkBlue.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayDarkGreen.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayDarkGrey.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayDarkRed.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayGrey.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayIndigo.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayOrange.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayPink.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayPurple.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayRed.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayWhite.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
OverlayYellow.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
PurificationChamberFrontOff.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
PurificationChamberFrontOn.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
PurificationChamberFrontOn.png.mcmeta	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
RefinedGlowstone.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
RefinedObsidian.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SolarGeneratorFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SolarGeneratorSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SolarGeneratorTop.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SteelBlock.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
SteelCasing.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
Teleporter.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
TeleporterFrame.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
TinOre.png	Begin work on copper and tin ore and ingots :)	2013-12-01 21:58:35 -05:00
UltimateEnergyCubeFront.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
UltimateEnergyCubeSide.png	First 1.6 push, still work to be done	2013-07-20 12:10:14 -04:00
wire.aluminum.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.copper.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.iron.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.silver.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.superconductor.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00
wire.tin.png	Readded universal wires into Mekanism Induction	2013-12-01 13:46:15 +08:00