drcrazy
e3be87d517
MOre fixes for items. Down to 860
2019-02-22 01:13:30 +03:00
drcrazy
e513e20e5a
Migrated batteries + TR Itemgroup
2019-02-22 00:22:43 +03:00
modmuss50
0c99a94250
Update packets to new format, 930 errors
2019-02-21 18:29:04 +00:00
modmuss50
f6a79ce579
Some random fixes, 959 errors
2019-02-21 18:11:55 +00:00
modmuss50
0975b4353b
Nuke the dev command as it will need rewriting
2019-02-21 17:56:04 +00:00
modmuss50
a93361792f
fix ConfigRegistry location, 1118 errors
2019-02-21 17:55:17 +00:00
modmuss50
02d2d9cf1c
Start work on porting tool and armor materials, values still need porting over
2019-02-21 17:53:30 +00:00
drcrazy
0b0435a1a2
MOre work on blocks. Less then 1200 errors left
2019-02-21 18:21:40 +03:00
drcrazy
93cf0a97d5
Tier 0, 2, 3 machine blocks fixed
2019-02-21 16:27:18 +03:00
drcrazy
3201ac878b
Energy Storage migrated
2019-02-21 16:00:12 +03:00
drcrazy
46fb0ede7a
Some migration for Nuke
2019-02-21 14:11:59 +03:00
drcrazy
bd00135137
Migrated getDrops
2019-02-21 13:54:49 +03:00
drcrazy
bdb8834a3e
Updated onBlockActivated
2019-02-21 13:35:54 +03:00
drcrazy
8489259672
Recipes migrated for ChemReactor and Rolling Machine
2019-02-21 13:08:16 +03:00
drcrazy
5c7c29f34d
Updated @RebornRegister annotation usage
2019-02-21 12:48:35 +03:00
drcrazy
860068b27a
Flora based extractor recipes
2019-02-21 12:23:07 +03:00
drcrazy
398cb9617d
Removed unused import
2019-02-21 02:43:27 +03:00
drcrazy
1567920c8e
Updated addInformation method for blocks and items
2019-02-21 01:53:33 +03:00
drcrazy
6be1fbc4e9
Updated createNewTileEntity method
2019-02-21 00:19:11 +03:00
drcrazy
5bc08557b3
Migration work on TR armor
2019-02-20 23:12:36 +03:00
modmuss50
e03734e66d
Fix #1669
2019-02-20 19:39:23 +00:00
modmuss50
4aae2422fa
Fix LED lights not using correct cables
2019-02-15 19:12:11 +00:00
modmuss50
65b95afed8
After complaints that the manual is a scam, you can now refund it back into its ingredients.
...
Can be disabled in config
2019-02-15 18:33:45 +00:00
drcrazy
8b82259871
Iron and gold armor recycling in blast furnace.
2019-02-15 14:19:48 +03:00
modmuss50
4addff892b
Create a WrenchContext to allow for ic2 mod compat to register support for using ic2's wrench
2019-02-14 15:58:33 +00:00
drcrazy
8e34062f6e
Iron alloy smelter should consume right amount of inputs. Closes #1667
2019-02-13 14:56:49 +03:00
drcrazy
fbcab3bf2d
DRY for IronAlloySmelter fuel burn time
2019-02-13 11:21:21 +03:00
drcrazy
3fb799e544
Removed unused imports
2019-02-11 15:35:37 +03:00
drcrazy
0fa72c4fc3
More efficient diamond grinding and armor recycling
2019-02-11 15:32:24 +03:00
modmuss50
b9169c5397
Merge remote-tracking branch 'origin/1.12' into 1.12
2019-02-07 20:26:52 +00:00
modmuss50
c4fff1bf56
Should fix #1666
2019-02-07 20:26:41 +00:00
modmuss50
4797d64f5b
#releaseBuild fix Advanced alloy
2019-02-05 00:15:43 +00:00
modmuss50
6595bb80c5
Move type registry to before the ic2 dict, add advanced alloy to classic dedupe.
2019-02-04 21:51:21 +00:00
modmuss50
8549129870
Dont register refined iron smelting recipe with classic dedupe enabled
2019-02-04 21:27:49 +00:00
modmuss50
f836fb84c7
Move IC2_PROFILE to a config, the event is fired too early to be used.
2019-02-04 20:53:33 +00:00
modmuss50
6916de2ad7
Added support for ic2 exp classic profile
2019-02-04 20:19:51 +00:00
modmuss50
9301cfbc90
Improve rolling machine item balancing, it will no longer move items around when there isnt a better distribution
2019-02-01 14:46:18 +00:00
modmuss50
72a09d2368
Fixes some possible NPE locations
2019-02-01 13:42:21 +00:00
coderbot
3e44fc369f
Transformers now declare that they can output multiple packets per tick
2019-01-28 17:38:02 -08:00
modmuss50
12b892f0dc
Fix Alarm recipe with IC2 Dedupe
2019-01-27 01:42:52 +00:00
modmuss50
8505616651
Fix fusion coil not being crafted with ic2 de-dupe
2019-01-26 19:06:51 +00:00
modmuss50
0228d72179
Always add refined iron ingot to smelting, I forgot to remove it
2019-01-24 21:38:21 +00:00
modmuss50
f4a24d7c25
Fixes to retro gen
2019-01-24 21:35:39 +00:00
modmuss50
5a9349ced4
Pull back power output on Thermal gen as I made it a bit too much last commit. Now 16
2019-01-24 21:26:56 +00:00
Modmuss50
bc1e2ca7eb
Thermal Generator now outputs 32 eu/tick
2019-01-20 21:14:15 +00:00
modmuss50
498d675f30
Remove Refined Iron from ic2 duplicates
2019-01-18 16:20:34 +00:00
drcrazy
292664b8e1
Fixed i18n usage on server. Closes #1655
2019-01-16 18:07:48 +03:00
drcrazy
7cc0c472f9
Adjustments for updated power output icon.
2019-01-14 15:11:26 +03:00
drcrazy
1a8c730591
Plasma generator got its icon in JEI. Closes #1653
2019-01-14 14:10:26 +03:00
drcrazy
8a03b0eca2
More on #1654
2019-01-14 14:04:58 +03:00
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