modmuss50
|
05d95915e5
|
Dont jar in jar, it breaks some stuff
|
2019-08-19 20:41:30 +01:00 |
|
modmuss50
|
39ea95ec9e
|
#betaBuild
|
2019-08-19 20:39:53 +01:00 |
|
modmuss50
|
0d0d2b23d5
|
Include RC in the TR jar
|
2019-08-19 20:24:31 +01:00 |
|
Daniel She
|
f0b8d99853
|
Update to REI 3.0-pre (#1793)
* Update to REI 3.0-pre
* Update fabric.mod.json
|
2019-08-19 14:26:47 +01:00 |
|
modmuss50
|
d7d7eeb2ed
|
#betaBuild
|
2019-08-18 16:04:58 +01:00 |
|
modmuss50
|
047e4b7401
|
#betaBuild
|
2019-08-13 22:11:45 +01:00 |
|
modmuss50
|
bedae13e2a
|
#betaBuild
|
2019-08-13 16:30:44 +01:00 |
|
modmuss50
|
eca7aaa34f
|
add a Towelette plugin to blacklist our fluids, fixes the game not loading
|
2019-08-13 16:24:24 +01:00 |
|
drcrazy
|
54813ecdc3
|
Bumped modloader + recipes + lang for buckets
|
2019-08-13 13:51:44 +03:00 |
|
modmuss50
|
c17c49249a
|
#betaBuild
|
2019-08-12 23:47:10 +01:00 |
|
modmuss50
|
2a5708b328
|
Rolling machine port/fixes
|
2019-08-12 15:05:49 +01:00 |
|
modmuss50
|
a906fad739
|
#betaBuild
|
2019-08-09 00:26:47 +01:00 |
|
modmuss50
|
2edffead05
|
update to use fabric api's offical event
|
2019-08-08 23:35:27 +01:00 |
|
modmuss50
|
861e79a398
|
#betaBuild
|
2019-08-08 13:52:02 +01:00 |
|
modmuss50
|
a7d069d48c
|
Fix build
|
2019-08-08 13:47:59 +01:00 |
|
modmuss50
|
4c25ba221c
|
#betaBuild
|
2019-08-07 21:40:42 +01:00 |
|
modmuss50
|
c7a0bb6aec
|
#betaBuild
|
2019-08-07 20:29:00 +01:00 |
|
modmuss50
|
e4136f547d
|
Fix version not being set in the mod.json + some clean up
|
2019-08-06 23:42:25 +01:00 |
|
modmuss50
|
e1112a5cff
|
Fix build
|
2019-08-06 23:06:55 +01:00 |
|
modmuss50
|
0dc2636046
|
Final build fixes
|
2019-07-25 14:35:27 +01:00 |
|
modmuss50
|
7bf0e4f08a
|
Fix build?
|
2019-07-25 14:16:30 +01:00 |
|
modmuss50
|
52da17dfd5
|
Start on REI support, very basic right now, but it will help a lot when adding recipes.
|
2019-07-25 13:14:46 +01:00 |
|
modmuss50
|
9b46e3237e
|
move to silk fluids
|
2019-07-23 21:30:57 +01:00 |
|
modmuss50
|
50c13bafdc
|
1.14.4
|
2019-07-22 11:31:24 +01:00 |
|
modmuss50
|
e26d1edc52
|
Configs
|
2019-07-10 21:56:22 +01:00 |
|
modmuss50
|
18950e0b29
|
1.14.3 + more recipe fixes
|
2019-07-01 00:24:12 +01:00 |
|
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
|
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 |
|
drcrazy
|
5c309c8b3d
|
Updated forge to 1.13.2 - 25.0.191. Removed unused imports
|
2019-04-26 17:37:10 +03:00 |
|
drcrazy
|
c122a480e5
|
Updated forge and mappings
|
2019-04-01 17:22:59 +03:00 |
|
modmuss50
|
f9efc72c99
|
Update forge
|
2019-03-05 14:28:42 +00:00 |
|
modmuss50
|
ff1370a3fd
|
Fix opening guis, still needs some work, but atleast it works now
|
2019-03-02 18:45:33 +00:00 |
|
modmuss50
|
001dd9ac74
|
Basic work on the genResources task
|
2019-03-01 21:24:26 +00:00 |
|
modmuss50
|
db3a6f2c7e
|
Enough to get the game running
|
2019-02-23 23:51:37 +00:00 |
|
modmuss50
|
fd0fa8c66e
|
Bunch of item work, 96
|
2019-02-22 15:02:41 +00:00 |
|
drcrazy
|
647b126c98
|
Updated mappings
|
2019-02-22 14:36:13 +03:00 |
|
modmuss50
|
df8c2cd34b
|
1.13.2
|
2019-02-20 20:27:03 +00:00 |
|
drcrazy
|
5bc08557b3
|
Migration work on TR armor
|
2019-02-20 23:12:36 +03:00 |
|
modmuss50
|
368e2d48df
|
2123 - Gradle setup
|
2019-01-12 19:56:42 +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
|
e299518c4e
|
#releaseBuild
|
2018-12-20 11:18:35 +00:00 |
|
modmuss50
|
08b8039e9f
|
#releaseBuild
|
2018-12-09 14:06:58 +00:00 |
|
modmuss50
|
0d9e98b370
|
Cleanup ic2 support
|
2018-12-09 00:24:52 +00:00 |
|
modmuss50
|
1dd864f467
|
#releaseBuild Large refactor, ensure you update TechReborn and RebornCore
|
2018-12-08 16:43:07 +00:00 |
|
modmuss50
|
e7604cd9ce
|
#betaBuild
|
2018-11-30 17:26:10 +00:00 |
|
modmuss50
|
385a5ea8b5
|
Include TechReborn Mod Compatibility using jar in jar
|
2018-11-16 16:51:26 +00:00 |
|
modmuss50
|
dc64b26655
|
Fix build?
|
2018-11-16 15:47:06 +00:00 |
|
modmuss50
|
aa0ffe7559
|
Stage one of moving compat code out into a separate project
|
2018-11-16 15:44:33 +00:00 |
|
