drcrazy
381fbfb463
Fix JEI info for sawmill energy usage. Some work for #1654
2019-01-14 14:04:22 +03:00
modmuss50
f08fd1da4d
1591 - I think ill come back to this another day
2019-01-13 17:04:03 +00:00
modmuss50
b6312b124a
1696 - find + replace pass
2019-01-13 16:51:50 +00:00
modmuss50
4422fc7dc0
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/gui/GuiBlastFurnace.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/compat/CompatManager.java
2019-01-12 12:08:28 +00:00
modmuss50
43cf6d7807
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java
# src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java
# src/main/java/techreborn/items/battery/ItemBattery.java
# src/main/java/techreborn/items/battery/ItemEnergyCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronicOrb.java
# src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java
# src/main/java/techreborn/items/battery/ItemRedCellBattery.java
# src/main/java/techreborn/items/tool/ItemChainsaw.java
# src/main/java/techreborn/items/tool/ItemDrill.java
# src/main/java/techreborn/items/tool/ItemJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java
# src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
# src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
# src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
# src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java
# src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2019-01-07 22:59:06 +00:00
modmuss50
7df4742784
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java
# src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java
# src/main/java/techreborn/items/battery/ItemBattery.java
# src/main/java/techreborn/items/battery/ItemEnergyCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronicOrb.java
# src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java
# src/main/java/techreborn/items/battery/ItemRedCellBattery.java
# src/main/java/techreborn/items/tool/ItemChainsaw.java
# src/main/java/techreborn/items/tool/ItemDrill.java
# src/main/java/techreborn/items/tool/ItemJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java
# src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
# src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
# src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
# src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java
# src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2019-01-07 22:58:42 +00:00
modmuss50
95ef8e4df5
#releaseBuild
2019-01-03 14:05:49 +00:00
drcrazy
d67f670141
addHologramButton is now in RC
2018-12-30 22:50:03 +03:00
drcrazy
3df454789f
Draw hologram button on background
2018-12-30 22:31:52 +03:00
drcrazy
03fdbe49a6
Power bar tooltip should be on top of hologram button
2018-12-30 02:48:35 +03:00
drcrazy
d41da2457f
Lock button works again
2018-12-30 01:19:23 +03:00
drcrazy
b33b3d8745
Updates due to TR GUI builder gone.
2018-12-28 18:07:56 +03:00
coderbot16
fbec0c89c2
Finalize IC2 electric item support ( #1644 )
...
* Item charging no longer uses CapabilityEnergy, now fully uses ExternalPowerSystems
* Remove accidental update from build.gradle
* Remove some unused imports
* Use requestEnergyFromArmor in all powered tools
2018-12-28 09:25:40 +00:00
drcrazy
5724fc3d8c
Rolling machine can now charge from battery. Closes #1645
2018-12-28 12:24:05 +03:00
coderbot16
a766cdfa53
Remove almost all explicit uses of CapabilityEnergy ( #1643 )
...
* Battery packs (ItemLithiumBackpack/ItemLapotronPack) still use CapEnergy explicitly, but don't charge IC2 items.
* Note: Before we can remove FE, we have to modify StackInfoHUD and ItemUtils in RebornCore.
2018-12-27 13:58:55 +00:00
modmuss50
c064b72bc5
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
2018-12-26 16:08:12 +00:00
modmuss50
4440c2f305
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
2018-12-26 16:08:04 +00:00
drcrazy
fbc8ceb1ed
AESU poweroutput icon fixed
2018-12-22 13:06:03 +03:00
drcrazy
e2c8284bc5
Added config for Rubber Tree plantations in villages. Closes #1639
2018-12-19 18:22:45 +03:00
drcrazy
3b1b0b59da
Removed more excessive this-es.
2018-12-17 18:09:40 +03:00
drcrazy
6e237a4fcb
Removed excessive this-es. WIP
2018-12-17 15:53:35 +03:00
drcrazy
15cf0d49ad
scrap slot same is usual slot.
2018-12-17 15:26:50 +03:00
drcrazy
83fd409e94
Fixed license and unused imports
2018-12-12 16:14:36 +03:00
modmuss50
0d9e98b370
Cleanup ic2 support
2018-12-09 00:24:52 +00:00
modmuss50
cb292205dd
Dont force a crash, just let it happen naturally,
2018-12-08 23:37:31 +00:00
modmuss50
a04760bac1
Tweak incompatible message
2018-12-08 22:34:15 +00:00
modmuss50
7433eb7630
Fix bad rename
2018-12-08 22:05:36 +00:00
modmuss50
bb5a3e2647
Clean up ic2 support
2018-12-08 20:48:21 +00:00
modmuss50
7db621fbed
Abstract ic2 in RebornCore, rewrite Reborn Core's configs
2018-12-08 20:15:20 +00:00
drcrazy
5d4ffab5de
Adjusted JEI clickareas
2018-12-05 17:50:54 +03:00
drcrazy
7c1daf83e0
Updated JEI button location.
2018-12-04 18:12:05 +03:00
modmuss50
f91493dbc5
Move gui code to reborn core
2018-12-02 16:13:00 +00:00
modmuss50
b399e211fa
Move container builder to Reborn Core
2018-12-02 01:15:03 +00:00
modmuss50
8334de2604
Fix config going into wrong dir
2018-11-27 18:01:50 +00:00
modmuss50
385a5ea8b5
Include TechReborn Mod Compatibility using jar in jar
2018-11-16 16:51:26 +00:00
modmuss50
aa0ffe7559
Stage one of moving compat code out into a separate project
2018-11-16 15:44:33 +00:00
modmuss50
a27007e1a3
Clean up of compat code
2018-11-15 12:29:42 +00:00
modmuss50
f808c61a51
Use mekanism's gas registry to register mek gases to be used in the gas turbine. Closes #1575
...
Remove some old psi compat code as well as it was never used
2018-11-15 12:24:42 +00:00
modmuss50
7e5ec8d70f
Fix retro gen. Fixes #1622
2018-11-15 11:06:53 +00:00
drcrazy
7ce4a022af
Cables got tooltip update. Closes #1627
2018-11-07 03:03:26 +03:00
drcrazy
9f3a3eb026
Refactoring of tooltips
2018-11-06 18:12:19 +03:00
drcrazy
941629e790
Progress for matter fabricator finally works. Closes #1630
2018-11-06 17:46:07 +03:00
drcrazy
c7db26c21e
Legacy code removed
2018-11-06 12:56:16 +03:00
drcrazy
430f534b3a
Updated JEI compat to use VanillaTypes once again.
2018-11-05 13:03:00 +03:00
drcrazy
7ab571bcc7
More marble dust required to make calcite dust. Closes #1629
2018-11-05 12:39:22 +03:00
drcrazy
df13aeeba2
Should fix electric furnace progress + formatting. Closes #1621
2018-10-29 17:40:16 +03:00
drcrazy
50e35578a2
Matter fabricator got progress arrow back. Closes #1617
2018-10-23 17:54:12 +03:00
drcrazy
26e09d1687
WaterMill and neutron reflectors deduplicated. Closes #1620
2018-10-23 17:26:39 +03:00
drcrazy
066c6ba3e0
INitial work on #1620
2018-10-23 13:44:06 +03:00
drcrazy
bdd961e0a7
Rubber wood block will give more slabs and stairs. Closes #1619
2018-10-19 16:10:23 +03:00
Prospector
0cbefc63d2
Rename 1 thing
2018-10-17 18:21:57 -07:00
modmuss50
7fe876fe73
Fix #1614
2018-10-07 21:53:46 +01:00
modmuss50
20b1874e2c
Fix #1602
2018-10-07 21:36:39 +01:00
modmuss50
a0ee459d13
Make empty cells require a glass pane due to thermal expansion changing their gear recipes to clash. Config to disable + add old recipe to rolling machine
2018-10-07 21:31:35 +01:00
modmuss50
66e60655bf
Work towards https://github.com/TechReborn/TechReborn/issues/1614 still need to move all the other recipes that need it to use the ore dict
2018-10-07 21:20:18 +01:00
drcrazy
4612ab334c
Cleanup of model registration
2018-10-04 12:38:34 +03:00
drcrazy
ec0724b15f
Refactoring for model registration
2018-10-03 18:26:47 +03:00
drcrazy
4ea5d2a818
Fix model registration. Moved items reg to event.
2018-10-03 17:34:03 +03:00
drcrazy
e9c2857db8
Initial work on event based registration
2018-09-26 18:28:59 +03:00
modmuss50
6713cd6296
Initial removal of itemblocks, wrench now drops the item with the nbt of the tile.
...
This is still WIP but mostly seems to work
2018-09-25 17:51:25 +01:00
drcrazy
d06bd5eef9
Improvements for debug tool and solar panel
2018-09-25 16:00:44 +03:00
drcrazy
1e9cfa07b6
Removed excessive setCreativeTab from blocks
2018-09-25 13:56:59 +03:00
drcrazy
f600432f05
All machines are now in enum.
2018-09-25 13:39:41 +03:00
drcrazy
20a385f6ca
Fix block break
2018-09-25 03:42:12 +03:00
drcrazy
25f06384f4
Energy storage enum-ed
2018-09-25 03:09:56 +03:00
drcrazy
f2d8891bd5
Fix build
2018-09-25 02:47:46 +03:00
drcrazy
f7ecfd0574
Item\Fluid storages went to enum.
2018-09-25 02:41:30 +03:00
drcrazy
809c02934a
Moved generators to enum
2018-09-24 16:49:44 +03:00
drcrazy
86a2612b97
Moved some machines to enum
2018-09-24 16:13:35 +03:00
drcrazy
dd94ff31c9
Blocks moved to TRContent
2018-09-24 15:45:48 +03:00
drcrazy
9f9595f955
Moved items into content
2018-09-24 14:28:58 +03:00
drcrazy
bf7f7ba871
Renamed ModBlocks to TRBlocks
2018-09-23 23:21:19 +03:00
drcrazy
f02b24f813
Fixed cables rendering
2018-09-22 16:50:33 +03:00
drcrazy
7a005f7494
Sorting and renaming for cables and panels. Still not rendering
2018-09-21 19:44:30 +03:00
modmuss50
e068ca018c
flatten cables, they dont render correctly in world yet
2018-09-20 19:49:25 +01:00
drcrazy
a5a0d03591
Solar panels flattened.
2018-09-20 16:42:32 +03:00
modmuss50
5377941e10
Fixes issues with ores, closes https://github.com/FTBTeam/FTB-Continuum/issues/461
2018-09-19 16:46:32 +01:00
drcrazy
b7a0854cae
MOre work on solar panels. Blockstate json isn't ready yet.
2018-09-19 18:24:35 +03:00
drcrazy
10e91deeff
Iron machines got their names back. Closes #1606
2018-09-19 13:06:41 +03:00
drcrazy
4245decc3c
Some work on solar panels flattening
2018-09-18 15:32:13 +03:00
drcrazy
0918bceb23
Call getHeatFromState in a static way.
2018-09-18 12:45:29 +03:00
ProfessorProspector
b4ca82a97b
Move machine casings over and temp gen localization
2018-09-17 17:07:11 -07:00
drcrazy
0c54a4538e
More cleanup after refactoring
2018-09-17 16:42:17 +03:00
drcrazy
bdf53c9094
Add block info into debug tool output
2018-09-17 15:55:09 +03:00
drcrazy
89ca71386f
re-Structured assets for items a little bit
2018-09-17 14:32:55 +03:00
drcrazy
be23d2af6e
Cleanup after refactoring
2018-09-17 13:16:49 +03:00
modmuss50
524770abba
Move around some classes that didnt need their own high level package
2018-09-17 07:34:13 +01:00
modmuss50
f6d5d88a4b
rename TileLegacyMachineBase to TileMachineBase
2018-09-17 07:31:41 +01:00
ProfessorProspector
714ddd075b
Update logo & mcmod.info
2018-09-16 20:41:42 -07:00
ProfessorProspector
0b963dcda9
Continue to make sense of things... this mod's a mess lol
2018-09-16 20:31:01 -07:00
ProfessorProspector
d98802ee1b
Add example tags based on Lex's example
2018-09-16 18:56:03 -07:00
ProfessorProspector
c568876caa
Revert ore dict comment & remove useless stuff
2018-09-16 14:01:00 -07:00
ProfessorProspector
e5736669ca
Refactoring & cleaning
2018-09-16 13:48:51 -07:00
ProfessorProspector
874559c21e
Try to make things make more sense
2018-09-15 19:36:37 -07:00
drcrazy
f6c143dce3
Flattened casings
2018-09-16 03:34:26 +03:00
drcrazy
1d4116a215
Flattened frames
2018-09-14 17:16:59 +03:00
modmuss50
5307fd4528
Fix fluid config showing when it shouldn't
2018-09-13 20:01:35 +01:00
modmuss50
01a3663b11
more changes to the inventory stuff
2018-09-13 19:56:32 +01:00
modmuss50
01644e4f65
Fix slot config, some changes to the way Inventory works as well to allow for this.
2018-09-13 19:33:14 +01:00
drcrazy
305f74b107
Storage blocks flattened
2018-09-12 16:56:24 +03:00
drcrazy
7393a8bdd6
Ores flattened
2018-09-12 16:15:05 +03:00
drcrazy
916c8c5ba4
Initial work on ores flattening
2018-09-10 16:45:04 +03:00
drcrazy
35669641ba
Changed translation names for ingredients
2018-09-10 13:42:22 +03:00
drcrazy
1b3bf6f5c2
Cleaned up translation keys
2018-09-07 17:37:49 +03:00
drcrazy
b05c2e948f
Reorganized items json registration
2018-09-07 16:27:19 +03:00
Modmuss50
3444c05c40
IInventory > IItemHandler
...
Most things should work, but havent been tested
Slot config will not work just yet
2018-09-07 14:05:19 +01:00
drcrazy
645606c5c4
itemRubber already oredicted in proper class
2018-09-07 15:25:10 +03:00
drcrazy
6d3d1f2df2
Organized items. MOved creative tab setter to parent.
2018-09-07 14:51:41 +03:00
drcrazy
c56da8cf18
Use static fuse in static way. cherry-pick from: 8cac9a9315
2018-09-07 12:21:34 +01:00
drcrazy
8cac9a9315
Use static fuse in static way.
2018-09-07 13:31:38 +03:00
Modmuss50
67226de701
fix compile changes
2018-09-05 18:43:33 +01:00
Modmuss50
6060a97855
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/client/container/ContainerPda.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
# src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
# src/main/java/techreborn/init/ModBlocks.java
# src/main/java/techreborn/init/ModTileEntities.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
# src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
# src/main/resources/assets/techreborn/lang/en_us.lang
# src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
# src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
# src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
# src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
# src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
# src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
2018-09-05 17:49:49 +01:00
drcrazy
6d4616b38e
Updated constructor parameter name
2018-09-04 17:37:32 +03:00
drcrazy
b41783054e
Fixed translation keys and update TR discord link
2018-09-04 17:25:45 +03:00
drcrazy
79ff8ee5b0
Cleaned up code dupes
2018-09-04 13:46:51 +03:00
drcrazy
a05ba25f31
Flattened upgrades
2018-09-04 13:26:09 +03:00
drcrazy
a40635e75f
Renamed ModItems to TRItems. Sorted members inside it.
2018-09-03 17:46:21 +03:00
drcrazy
0443ad4a3a
Destructopack is a separate item
2018-09-03 17:01:46 +03:00
drcrazy
33b9f697dc
Merged all ingredients into single class
2018-09-03 14:49:59 +03:00
drcrazy
0b1733b733
DUsts and dustsSmall are combined into single class
2018-09-03 14:00:06 +03:00
drcrazy
f01d75404c
Buffed oreCoal processing in Industrial Grinder
2018-09-02 23:45:02 +03:00
Modmuss50
9a19223c84
Revert "Updated JEI compat to use VanillaTypes"
...
This reverts commit c41b889
Done becuase VanillaTypes are not in a stable build of JEI
2018-09-02 14:02:08 +01:00
drcrazy
08cee81d54
Updated machine names in JEI.
2018-09-01 03:01:51 +03:00
drcrazy
3190185a54
Cleaned fluid translation keys.
2018-09-01 02:46:25 +03:00
Modmuss50
53ad3a7a60
Add configs to the nuke, closes #1594
2018-08-31 16:32:16 +01:00
drcrazy
edf0227598
CLeanup of blocks
2018-08-31 15:36:39 +03:00
Modmuss50
1b0ff5f95a
Fix small naming issue
2018-08-31 13:25:01 +01:00
Modmuss50
cc8c2c6e3b
Fix odd name for Auto Crafting Table
2018-08-31 13:19:55 +01:00
drcrazy
cdaefe5886
Changed translation keys for block and items
2018-08-31 14:51:03 +03:00
Modmuss50
9b0f583cab
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin
2018-08-30 22:47:25 +01:00
drcrazy
2d3c074767
Fix for cells in CT scripts. Some work on #1590
2018-08-29 18:23:56 +03:00
drcrazy
c41b889160
Updated JEI compat to use VanillaTypes
2018-08-29 16:44:45 +03:00
drcrazy
f0852a09cf
Updated JEI createDrawable usage for fusion reactor.
2018-08-28 16:43:37 +03:00
drcrazy
f54353290b
Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437
2018-08-28 14:32:59 +03:00
EnGinners
304046b457
Update ru_ru.lang ( #1582 )
...
This one has less changes compare to similar one from @AlekseiVoronin
2018-08-28 13:40:47 +03:00
drcrazy
e254f519c6
Removed excessive not null check
2018-08-28 11:21:15 +03:00
Modmuss50
c1be3fb765
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428
2018-08-27 18:23:16 +01:00
drcrazy
f44aa92093
Removed unused imports
2018-08-27 17:52:26 +03:00
drcrazy
db4dbdc956
UU-matter is now part of parts enum
2018-08-27 15:48:41 +03:00
drcrazy
8f7cc291bd
OreDict partially back, same for some recipes
2018-08-27 15:28:26 +03:00
drcrazy
8987311694
Flattened parts
2018-08-27 13:26:56 +03:00
Modmuss50
f251349189
Should fix #1587
2018-08-24 21:07:38 +01:00
YuRaNnNzZZ
2e461b5ef6
rock cutter no longer gets enchanted on recraft
2018-08-24 20:12:50 +03:00
drcrazy
de45f3e68d
SmallDusts flattened
2018-08-24 15:56:53 +03:00
drcrazy
edd4e0df3e
Flattened dusts.
2018-08-24 14:56:25 +03:00
drcrazy
1ee9ffb007
Flattened ingots.
2018-08-24 13:43:03 +03:00
drcrazy
aadc7150f3
Gems are flattened
2018-08-23 17:16:17 +03:00
drcrazy
2939ee02a3
Flattened nuggets
2018-08-23 15:20:57 +03:00
drcrazy
45d6317d12
Changes plates registration
2018-08-23 14:05:22 +03:00
drcrazy
c86f3dc2f4
Changes after PR review
2018-08-23 13:36:56 +03:00
drcrazy
f45da44f2b
Plates are flattened and enumed
2018-08-23 00:14:02 +03:00
drcrazy
be024f0179
Updated forge
2018-08-22 15:55:14 +03:00
Modmuss50
1d7ff39ccf
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-08-14 01:09:18 +01:00
Modmuss50
77ec6b6aaf
Hot fix for #1574 #releaseBuild
2018-08-14 01:08:50 +01:00
drcrazy
337a500a5c
Coolant part also craftable from water cells
2018-08-13 15:35:30 +03:00
冷风
3681e0b1e3
Update zh_cn.lang
2018-08-13 08:58:10 +08:00
Modmuss50
35f82eb5d3
Update licenses
2018-08-12 16:36:16 +01:00
Modmuss50
4e352c0953
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid
2018-08-12 16:32:43 +01:00
Modmuss50
84aeeb978c
Fix most modded fluids not working in our machines
2018-08-11 20:08:44 +01:00
Modmuss50
89beff99c7
Fluid config work
2018-08-11 15:23:57 +01:00
Modmuss50
808a07fdbf
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-08-10 17:46:10 +01:00
Modmuss50
39475f86dc
Initial fluid config work
2018-08-10 17:45:16 +01:00
drcrazy
f7df41c379
Fix for typo in world config name.
2018-08-10 15:38:46 +03:00
drcrazy
d37f52a0ce
Less chance for overworld TR loot and made in configurable. CLoses #1572
2018-08-10 15:33:59 +03:00
drcrazy
c3979610a9
Removed unused imports
2018-08-10 15:32:17 +03:00
modmuss50
062114f3a9
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-08-08 15:15:53 +01:00
modmuss50
7270adbec4
Revert: [ImgBot] optimizes images - Fixes textures having a solid background
2018-08-08 15:15:26 +01:00
drcrazy
fb957e9dac
Allow oregen in non-vanilla dimensions. Closes #1571
2018-08-08 17:00:33 +03:00
drcrazy
2e4c3ebf1a
Some flattening attempt for plates
2018-08-07 13:50:46 +03:00
modmuss50
53b450acea
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
2018-08-03 18:04:40 +01:00
modmuss50
7e49c30586
Add a transparent grey overlay over recipe output slot
2018-08-03 17:55:59 +01:00
modmuss50
ee65ed0cbe
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-08-03 17:47:26 +01:00
modmuss50
e5d161cace
Write locked to nbt
2018-08-03 17:46:58 +01:00
Modmuss50
94fa8d1b62
Merge pull request #1569 from TechReborn/imgbot
...
[ImgBot] optimizes images
2018-08-03 00:40:16 +01:00
modmuss50
bbef813fe5
thanks idea for importing the best imports, fixes build
2018-08-02 19:09:11 +01:00
modmuss50
b8ad3175fd
Add JEI support for recipes in auto crafting table
2018-08-02 19:07:56 +01:00
modmuss50
e1d1ab8c08
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-08-02 18:43:25 +01:00
modmuss50
ffb770f64f
Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example.
2018-08-02 18:42:58 +01:00
drcrazy
d03b0edbd7
Max energy for matter fabricator is 10M EU \ 40M FE
2018-08-02 18:06:43 +03:00
modmuss50
16293571a2
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-07-30 19:42:28 +01:00
modmuss50
3d9b81a6b0
Fix possible dupe bug, and allow better support for larger item stack sizes
2018-07-30 19:42:08 +01:00
drcrazy
a75a493de7
Added blaze dust and HOP graphite dust recipes.
2018-07-30 13:07:50 +03:00
drcrazy
a6f242e7e6
Overriden setContainerToEmpty. I thought this was already in GH.
2018-07-30 11:48:39 +03:00
ImgBotApp
2a0d737c92
[ImgBot] optimizes images
...
/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png -- 0.44kb -> 0.43kb (3.1%)
2018-07-28 18:42:24 +00:00
ImgBotApp
3dd8a18868
[ImgBot] optimizes images
...
*Total -- 420.59kb -> 198.23kb (52.87%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_glow.png -- 14.67kb -> 0.34kb (97.68%)
/src/main/resources/assets/techreborn/textures/items/nugget/iridium_nugget.png -- 14.25kb -> 0.37kb (97.42%)
/src/main/resources/assets/techreborn/textures/blocks/ore/iridium_ore.png -- 14.39kb -> 0.44kb (96.95%)
/src/main/resources/assets/techreborn/textures/items/plate/iridium_plate.png -- 14.37kb -> 0.44kb (96.91%)
/src/main/resources/assets/techreborn/textures/items/ingot/iridium_ingot.png -- 14.36kb -> 0.44kb (96.9%)
/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png -- 15.23kb -> 0.67kb (95.61%)
/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png -- 15.46kb -> 0.81kb (94.76%)
/src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png -- 15.51kb -> 0.96kb (93.82%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/creative_panel_side.png -- 17.11kb -> 1.24kb (92.76%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/creative_panel_top.png -- 15.22kb -> 1.12kb (92.64%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_sctm.png -- 3.45kb -> 0.67kb (80.55%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_ctm.png -- 3.42kb -> 0.69kb (79.93%)
/src/main/resources/assets/techreborn/textures/items/cables/tin.png -- 1.21kb -> 0.36kb (70.26%)
/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png -- 1.28kb -> 0.41kb (68.24%)
/src/main/resources/assets/techreborn/textures/items/cables/hv.png -- 1.21kb -> 0.39kb (67.83%)
/src/main/resources/assets/techreborn/textures/items/cables/copper.png -- 1.21kb -> 0.40kb (67.04%)
/src/main/resources/assets/techreborn/textures/items/cables/gold.png -- 1.21kb -> 0.40kb (67.04%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/gui/destructopack.png -- 1.80kb -> 0.66kb (63.54%)
/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png -- 1.23kb -> 0.45kb (63.14%)
/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png -- 1.26kb -> 0.48kb (61.93%)
/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png -- 1.26kb -> 0.49kb (61.47%)
/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png -- 1.26kb -> 0.51kb (59.92%)
/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png -- 1.27kb -> 0.51kb (59.72%)
/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png -- 1.28kb -> 0.52kb (59.28%)
/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png -- 1.28kb -> 0.52kb (59.05%)
/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png -- 1.28kb -> 0.52kb (59.05%)
/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png -- 2.18kb -> 0.90kb (58.89%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png -- 4.22kb -> 1.83kb (56.53%)
/src/main/resources/assets/techreborn/textures/gui/chargebench.png -- 2.21kb -> 1.05kb (52.6%)
/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png -- 1.85kb -> 0.88kb (52.48%)
/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png -- 1.89kb -> 0.93kb (50.7%)
/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png -- 1.89kb -> 0.93kb (50.7%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png -- 3.78kb -> 1.87kb (50.54%)
/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png -- 1.89kb -> 0.94kb (50%)
/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png -- 1.89kb -> 0.94kb (50%)
/src/main/resources/assets/techreborn/textures/gui/compressor.png -- 2.54kb -> 1.36kb (46.55%)
/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png -- 2.57kb -> 1.38kb (46.28%)
/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png -- 2.73kb -> 1.48kb (45.78%)
/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png -- 2.74kb -> 1.51kb (44.88%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png -- 5.81kb -> 3.23kb (44.49%)
/src/main/resources/assets/techreborn/textures/gui/gas_generator.png -- 2.35kb -> 1.34kb (43.02%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png -- 3.38kb -> 1.92kb (42.99%)
/src/main/resources/assets/techreborn/textures/gui/jei_fluid_generator.png -- 2.29kb -> 1.32kb (42.47%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png -- 2.38kb -> 1.39kb (41.49%)
/src/main/resources/assets/techreborn/textures/gui/generator.png -- 2.48kb -> 1.46kb (41.06%)
/src/main/resources/assets/techreborn/textures/gui/fusion_reactor.png -- 1.91kb -> 1.16kb (39.32%)
/src/main/resources/assets/techreborn/textures/gui/jei.png -- 1.56kb -> 1.01kb (35.13%)
/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png -- 1.42kb -> 0.93kb (34.57%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridum_reinforced_stone_ctm.png -- 2.10kb -> 1.40kb (33.19%)
/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png -- 1.50kb -> 1.00kb (32.9%)
/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png -- 1.50kb -> 1.01kb (32.81%)
/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png -- 1.49kb -> 1.00kb (32.81%)
/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png -- 1.51kb -> 1.01kb (32.75%)
/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png -- 1.51kb -> 1.02kb (32.39%)
/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png -- 1.53kb -> 1.03kb (32.35%)
/src/main/resources/assets/techreborn/textures/gui/grinder.png -- 1.56kb -> 1.07kb (31.64%)
/src/main/resources/assets/techreborn/textures/blocks/rubber_leaves.png -- 0.87kb -> 0.60kb (31.13%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png -- 5.24kb -> 3.65kb (30.33%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png -- 2.44kb -> 1.76kb (27.96%)
/src/main/resources/assets/techreborn/textures/gui/lathe.png -- 1.75kb -> 1.27kb (27.51%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png -- 4.14kb -> 3.00kb (27.41%)
/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png -- 1.77kb -> 1.29kb (27.22%)
/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png -- 1.79kb -> 1.32kb (26.63%)
/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png -- 1.80kb -> 1.32kb (26.44%)
/src/main/resources/logo.png -- 37.62kb -> 27.76kb (26.21%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png -- 2.75kb -> 2.05kb (25.67%)
/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png -- 1.85kb -> 1.38kb (25.51%)
/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png -- 1.91kb -> 1.42kb (25.22%)
/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png -- 18.15kb -> 13.64kb (24.85%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png -- 4.17kb -> 3.18kb (23.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png -- 0.68kb -> 0.53kb (21.39%)
/src/main/resources/assets/techreborn/textures/blocks/cables/superconductor_cable.png -- 0.67kb -> 0.54kb (20%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png -- 2.64kb -> 2.12kb (19.77%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block_ctm.png -- 1.79kb -> 1.46kb (18.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_front.png -- 0.96kb -> 0.80kb (16.7%)
/src/main/resources/assets/techreborn/textures/gui/batbox.png -- 1.77kb -> 1.48kb (16.24%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png -- 1.13kb -> 0.96kb (14.97%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_side.png -- 0.95kb -> 0.81kb (14.59%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_sctm.png -- 2.12kb -> 1.82kb (14.26%)
/src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png -- 0.71kb -> 0.62kb (13.93%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png -- 4.23kb -> 3.65kb (13.8%)
/src/main/resources/assets/techreborn/textures/gui/mfe.png -- 2.05kb -> 1.78kb (13.36%)
/src/main/resources/assets/techreborn/textures/gui/mfsu.png -- 2.05kb -> 1.78kb (13.36%)
/src/main/resources/assets/techreborn/textures/gui/aesu.png -- 2.08kb -> 1.81kb (13.07%)
/src/main/resources/assets/techreborn/textures/gui/idsu.png -- 2.08kb -> 1.81kb (13.07%)
/src/main/resources/assets/techreborn/textures/gui/lesu.png -- 2.08kb -> 1.81kb (12.99%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_off.png -- 0.89kb -> 0.78kb (11.96%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png -- 1.54kb -> 1.40kb (9.37%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png -- 2.04kb -> 1.85kb (9.14%)
/src/main/resources/assets/techreborn/textures/items/plate/iron_plate.png -- 0.62kb -> 0.57kb (8.76%)
/src/main/resources/assets/techreborn/textures/items/ingot/chrome_ingot.png -- 0.59kb -> 0.54kb (8.14%)
/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png -- 0.48kb -> 0.44kb (7.96%)
/src/main/resources/assets/techreborn/textures/items/part/energy_flow_circuit.png -- 0.74kb -> 0.68kb (7.68%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png -- 0.69kb -> 0.64kb (7.64%)
/src/main/resources/assets/techreborn/textures/items/ingot/refined_iron_ingot.png -- 0.60kb -> 0.56kb (7.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_sctm.png -- 2.16kb -> 2.00kb (7.29%)
/src/main/resources/assets/techreborn/textures/items/part/tungsten_grinding_head.png -- 0.82kb -> 0.76kb (7.15%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_off.png -- 0.90kb -> 0.85kb (6.17%)
/src/main/resources/assets/techreborn/textures/items/ingot/zinc_ingot.png -- 0.59kb -> 0.56kb (6.11%)
/src/main/resources/assets/techreborn/textures/blocks/storage/refinediron_block.png -- 0.63kb -> 0.60kb (5.7%)
/src/main/resources/assets/techreborn/textures/items/ingot/titanium_ingot.png -- 0.59kb -> 0.56kb (5.64%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_side.png -- 0.68kb -> 0.65kb (5.43%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctmh.png -- 2.26kb -> 2.14kb (5.14%)
/src/main/resources/assets/techreborn/textures/items/ingot/silver_ingot.png -- 0.58kb -> 0.56kb (4.85%)
/src/main/resources/assets/techreborn/textures/items/tool/lapotronic_orbpack.png -- 0.72kb -> 0.69kb (4.47%)
/src/main/resources/assets/techreborn/textures/models/lapotronpack.png -- 0.64kb -> 0.61kb (4.29%)
/src/main/resources/assets/techreborn/textures/items/ingot/aluminum_ingot.png -- 0.58kb -> 0.56kb (3.89%)
/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png -- 0.89kb -> 0.86kb (3.83%)
/src/main/resources/assets/techreborn/textures/items/part/cupronickel_heating_coil.png -- 0.51kb -> 0.49kb (3.8%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_ctmh.png -- 2.41kb -> 2.33kb (3.4%)
/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png -- 0.89kb -> 0.86kb (3.28%)
/src/main/resources/assets/techreborn/textures/blocks/storage/steel_block.png -- 0.60kb -> 0.58kb (3.09%)
/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png -- 0.89kb -> 0.86kb (3.07%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_ctmh.png -- 2.36kb -> 2.29kb (3.06%)
/src/main/resources/assets/techreborn/textures/items/part/nichrome_heating_coil.png -- 0.51kb -> 0.49kb (2.88%)
/src/main/resources/assets/techreborn/textures/items/tool/cloaking_device.png -- 0.58kb -> 0.56kb (2.86%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass.png -- 0.63kb -> 0.61kb (2.64%)
/src/main/resources/assets/techreborn/textures/blocks/storage/titanium_block.png -- 0.61kb -> 0.59kb (2.57%)
/src/main/resources/assets/techreborn/textures/blocks/storage/silver_block.png -- 0.61kb -> 0.59kb (2.57%)
/src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb.png -- 0.58kb -> 0.56kb (2.53%)
/src/main/resources/assets/techreborn/textures/items/part/kanthal_heating_coil.png -- 0.51kb -> 0.49kb (2.32%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_sctm.png -- 1.95kb -> 1.91kb (2.11%)
/src/main/resources/assets/techreborn/textures/blocks/storage/chrome_block.png -- 0.61kb -> 0.59kb (2.1%)
/src/main/resources/assets/techreborn/textures/gui/elements.png -- 11.76kb -> 11.53kb (2.01%)
/src/main/resources/assets/techreborn/textures/items/ingot/steel_ingot.png -- 0.57kb -> 0.56kb (1.89%)
/src/main/resources/assets/techreborn/textures/items/part/data_control_circuit.png -- 0.58kb -> 0.57kb (1.69%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png -- 1.73kb -> 1.71kb (1.58%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png -- 1.35kb -> 1.33kb (1.51%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_block.png -- 0.60kb -> 0.59kb (1.3%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png -- 1.39kb -> 1.37kb (1.19%)
/src/main/resources/assets/techreborn/textures/items/part/diamond_grinding_head.png -- 0.83kb -> 0.82kb (1.06%)
/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png -- 0.90kb -> 0.89kb (0.98%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png -- 1.39kb -> 1.38kb (0.91%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png -- 1.57kb -> 1.56kb (0.56%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png -- 1.38kb -> 1.38kb (0.21%)
2018-07-28 18:38:58 +00:00
modmuss50
3659bfa5eb
Fix some small issues with the json files
2018-07-28 13:05:43 +01:00
modmuss50
88e116d095
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-07-26 18:28:58 +01:00
modmuss50
8139b865a9
Fix potential issues
2018-07-26 18:16:59 +01:00
modmuss50
693cb6807a
Inital pass of cleaning up the networking, I will prob do some more in 1.13
2018-07-24 14:27:17 +01:00
modmuss50
69b9c511c3
Remove legacy tile support
2018-07-24 14:23:31 +01:00
modmuss50
1f65363396
Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep
2018-07-24 14:18:22 +01:00
modmuss50
1be2752b72
Rename fluids
2018-07-24 14:18:09 +01:00
drcrazy
a42e04606f
Done with maxCharge and trasnferRate review for powered items
2018-07-23 14:21:07 +03:00
drcrazy
eb2816df1d
Returned return.
2018-07-23 13:47:12 +03:00
drcrazy
b3002b6f57
Fixed warnings
2018-07-23 12:55:18 +03:00
modmuss50
095390b430
Fix cell model
2018-07-20 22:39:09 +01:00
modmuss50
2910acc29c
Remove META_PLACEHOLDER
2018-07-20 22:36:38 +01:00
modmuss50
f5c6b59ebd
Mappings
2018-07-20 22:31:20 +01:00
modmuss50
389b716880
Fix build
2018-07-20 22:10:29 +01:00
modmuss50
7f8ce535a7
General code cleanup
2018-07-20 22:08:21 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC
2018-07-20 22:02:46 +01:00
modmuss50
f78abb1a21
Remove some old stuff
2018-07-20 21:55:29 +01:00
drcrazy
7b630f576f
Polishing powered items
2018-07-20 17:23:21 +03:00
drcrazy
daf4b6fad6
Capacity changes for powered armor
2018-07-20 12:58:52 +03:00
drcrazy
b3590dbb37
Make it run but tons of useless copy-paste
2018-07-20 02:56:19 +03:00
drcrazy
523d0284b7
Updated powered items to match RC changes
2018-07-19 18:30:47 +03:00
modmuss50
b65e963f12
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
...
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +01:00
drcrazy
2b74ea1ebe
Removed excessive finals.
2018-07-16 18:19:31 +03:00
drcrazy
5ce0397575
Changed Blocks.AIR to Material.AIR in multiblock checks.
2018-07-16 15:46:39 +03:00
drcrazy
60873481f3
Unused anymore.
2018-07-13 18:04:50 +03:00
drcrazy
c35d85fe10
More loot tables.
2018-07-12 17:41:14 +03:00
drcrazy
760dea8f94
Moved Event Bus registration to compat module.
2018-07-10 02:24:05 +03:00
drcrazy
2b32e6ecf1
Moved IC2 compat recipes from postInit to event. Closes #1565
2018-07-10 02:13:48 +03:00
drcrazy
1777343e96
Added TR loot to basic Overworld chests.
2018-07-09 17:06:15 +03:00
YuRaNnNzZZ
ced370444f
adv/diamond electric tools charge rate buff ( #1558 ) (Kudos to YuRaNnNzZZ)
2018-06-26 11:53:21 +03:00
drcrazy
ff9ceecc28
Removed unused imports )
2018-06-25 14:55:23 +03:00
modmuss50
d4a43d24a1
Fix incorrect usage of item stack checking
...
I have no idea how they worked without issue for this long :D
2018-06-25 12:34:13 +01:00
drcrazy
96d78c11a8
Shift for more info on powerbar. Closes FTBTeam/FTB-Continuum#261
2018-06-25 12:26:07 +03:00
modmuss50
7124ee6a11
Remove range upgrade as it didnt do anything
2018-06-24 10:48:47 +01:00
drcrazy
00a317074d
Speed up items charge.
2018-06-24 12:20:06 +03:00
drcrazy
af6cb38bfb
Fix crash with non-TR items charge.
2018-06-24 12:14:12 +03:00
drcrazy
d6b9656b7c
Fix for Assembly Machine JEI GUI progress. Closes #1555
2018-06-23 19:30:33 +03:00
drcrazy
452932c04e
More formatting changes.
2018-06-23 19:00:44 +03:00
Eric Chai
52ff6699b4
Fusion reactor consumes resources. Fixes #1551 ( #1556 )
...
Since resources are consumed during start up, they should also
be consumed when resetting the crafting cycle.
2018-06-23 18:40:56 +03:00
drcrazy
1de3fe5dc5
Lot of formatting.
2018-06-22 18:22:16 +03:00
drcrazy
d584aebcd8
Fixed water mill animation.
2018-06-22 13:35:26 +03:00
drcrazy
30302e241b
Fixed charging \ discharging items items. Closes #1547
2018-06-20 18:27:58 +03:00
Eric Chai
ca9a2c9b38
Corrected the ADVANCED_JACKHAMMER recipe ( #1553 )
2018-06-20 11:45:47 +03:00
drcrazy
48d2227407
Made batteries charge configurable for non-basic batteries.
2018-06-19 14:01:10 +03:00
ProfessorProspector
1ebf67d933
Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does
2018-06-16 10:27:19 -07:00
ProfessorProspector
a32c40a68a
Merge remote-tracking branch 'origin/1.12' into 1.12
2018-06-16 10:05:16 -07:00
ProfessorProspector
77ed9f7bba
Remove accidental refined diamond
2018-06-16 10:03:20 -07:00
modmuss50
0e857e8b70
Fix #1546
2018-06-16 16:37:17 +01:00
drcrazy
7be239adca
Updated wrenching logic for energy storages and casings. Closes #1543
2018-06-15 18:18:32 +03:00
drcrazy
24bce3ce66
Updated wrenching for lamp and alarm
2018-06-15 17:26:43 +03:00
drcrazy
8d1c116df0
Updated wrench logic for cables.
2018-06-15 16:49:46 +03:00
ProfessorProspector
603e346c0f
New ore textures
2018-06-14 19:17:53 -07:00
ProfessorProspector
9ed05fb7ff
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
...
# Conflicts:
# src/main/java/techreborn/blocks/BlockAlarm.java
2018-06-14 10:57:07 -07:00
ProfessorProspector
cfda5fd2a4
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
...
# Conflicts:
# src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
# src/main/java/techreborn/blocks/generator/BlockWaterMill.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
2018-06-14 10:53:32 -07:00
drcrazy
c409b67c3c
Updated block wrenching
2018-06-14 18:32:41 +03:00
drcrazy
77e1c54b86
Fixed inventory drop for DSU. More work on #1543
2018-06-14 18:32:40 +03:00
drcrazy
42bc110cb2
Fixed build, but DSU blocks are not done yet.
2018-06-13 17:42:46 +03:00
drcrazy
e2225b06d4
Updated wrenching logic. Some work for #1543
2018-06-13 15:28:31 +03:00
Prospector
6d3b415ddd
Unify creative tabs
2018-06-12 15:42:20 -07:00
drcrazy
baacc67a64
Fixed unused and override warnings.
2018-06-12 12:55:57 +03:00
modmuss50
7db0097d23
Fusion reactor uses inputs before the craft starts to prevent power exploit, closes #1539
2018-06-10 11:53:03 +01:00
modmuss50
c201b3dbcf
Make fusion reactor recipe shapeless, so it can work either way around
2018-06-10 11:47:51 +01:00
modmuss50
32ea97b29e
Fix #1541
2018-06-10 11:41:45 +01:00
modmuss50
dace0e56d0
Show required stacks when building fusion reactor
2018-06-10 11:36:21 +01:00
冷风
6fc0687d76
Update zh_cn.lang
2018-06-10 09:47:50 +08:00