Commit graph

93 commits

Author SHA1 Message Date
modmuss50
f8f20ce6ba 1.14.2 2019-06-13 13:14:11 +01:00
modmuss50
4479116d1c Add a tooltip event to fix the tooltips 2019-06-12 22:27:09 +01:00
modmuss50
07a5c322e3 it runs 2019-06-12 19:57:23 +01:00
modmuss50
6b9f6cb4f8 it compiles :D 2019-06-12 19:29:04 +01:00
modmuss50
d18d1b820e 397 2019-06-04 12:05:18 +01:00
modmuss50
e8396dbc33 831, doesnt seem impossible 2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c 1147 - Initial auto mappings pass 2019-05-26 12:37:59 +01:00
modmuss50
1dad4697ba Start moving everything over to the new system 2019-04-14 17:01:38 +01:00
drcrazy
97b517580a Fixed license 2019-03-01 18:59:11 +03:00
modmuss50
d7c4f55e6c Auto format imports 2019-02-23 19:14:30 +00:00
modmuss50
1c783abf9d Item fixes, it compiles :D 2019-02-23 19:13:57 +00:00
modmuss50
91994e5a01 229 - comment out all recipes as we can deal with these later + start thinking more about tags 2019-02-22 14:27:22 +00:00
modmuss50
a5b2adac78 More minor fixes, 370 2019-02-22 14:11:55 +00:00
modmuss50
18b3535607 More fixes 637 2019-02-21 23:07:44 +00:00
drcrazy
e513e20e5a Migrated batteries + TR Itemgroup 2019-02-22 00:22:43 +03:00
modmuss50
f6a79ce579 Some random fixes, 959 errors 2019-02-21 18:11:55 +00:00
modmuss50
a93361792f fix ConfigRegistry location, 1118 errors 2019-02-21 17:55:17 +00:00
drcrazy
5c7c29f34d Updated @RebornRegister annotation usage 2019-02-21 12:48:35 +03:00
modmuss50
b6312b124a 1696 - find + replace pass 2019-01-13 16:51:50 +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
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
bb5a3e2647 Clean up ic2 support 2018-12-08 20:48:21 +00:00
modmuss50
b399e211fa Move container builder to Reborn Core 2018-12-02 01:15:03 +00: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
dd94ff31c9 Blocks moved to TRContent 2018-09-24 15:45:48 +03:00
drcrazy
bf7f7ba871 Renamed ModBlocks to TRBlocks 2018-09-23 23:21:19 +03:00
ProfessorProspector
b4ca82a97b Move machine casings over and temp gen localization 2018-09-17 17:07:11 -07:00
modmuss50
524770abba Move around some classes that didnt need their own high level package 2018-09-17 07:34:13 +01:00
ProfessorProspector
e5736669ca Refactoring & cleaning 2018-09-16 13:48:51 -07:00
drcrazy
1b3bf6f5c2 Cleaned up translation keys 2018-09-07 17:37:49 +03:00
drcrazy
6d3d1f2df2 Organized items. MOved creative tab setter to parent. 2018-09-07 14:51:41 +03:00
drcrazy
33b9f697dc Merged all ingredients into single class 2018-09-03 14:49:59 +03:00
drcrazy
8987311694 Flattened parts 2018-08-27 13:26:56 +03:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01: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
Prospector
6d3b415ddd Unify creative tabs 2018-06-12 15:42:20 -07:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
modmuss50
7f289e2356
Add ic2 item discharge support, closes #1357 2017-12-17 21:36:48 +00:00
drcrazy
6c7f9078ec Secondary gem moved to eventHandler. Closes #1365 2017-12-15 16:43:48 +03:00
modmuss50
e2f177b757 Can now charge ic2 items, closes #1202 2017-11-27 13:34:45 +00:00
drcrazy
3d623292f8 Fixed more warnings 2017-11-10 12:48:01 +03:00
modmuss50
3901d60545 Some work on charging ic2 items, moving back to a proper pc. 2017-10-22 18:23:58 +01:00
modmuss50
17b09b882a Fix build issues 2017-09-28 22:44:55 +01:00
modmuss50
2e1c469524 Add support for wrenches from other mods. 2017-09-28 21:01:38 +01:00
David Vierra
a016a6dd49 Replace all emptiness checks == ItemStack.Empty with .isEmpty() (#1247)
Fixes #1157 and probably a few other things.
2017-08-25 11:08:15 -07:00
modmuss50
7eaef93136
Fix server start-up crash, #betaBuild 2017-06-18 14:14:42 +01:00
modmuss50
34978f7ffe Remove old upgrade handler to make way for the new one. 2017-04-11 00:12:36 +01:00
modmuss50
1656b4b4a0
Remove WIP tag from charge bench as it works
(cherry picked from commit 3025d5c)
2017-03-13 11:01:53 +00:00