modmuss50
|
db3a6f2c7e
|
Enough to get the game running
|
2019-02-23 23:51:37 +00:00 |
|
modmuss50
|
b8f09d29b7
|
Add mods.toml
|
2019-02-23 19:33:13 +00: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
|
7a441cea77
|
Taking a break now, 63
|
2019-02-22 15:11:38 +00:00 |
|
modmuss50
|
fd0fa8c66e
|
Bunch of item work, 96
|
2019-02-22 15:02:41 +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 |
|
drcrazy
|
ab2ce91e39
|
MOre rubber stuff. ONly sapling left to do
|
2019-02-22 17:25:31 +03:00 |
|
drcrazy
|
b6494ecbf6
|
Merge with HEAD
|
2019-02-22 17:19:38 +03:00 |
|
modmuss50
|
a5b2adac78
|
More minor fixes, 370
|
2019-02-22 14:11:55 +00:00 |
|
modmuss50
|
d68c65641d
|
Gui fixes, 393
|
2019-02-22 14:02:04 +00:00 |
|
drcrazy
|
06632be822
|
One more block done. Just a few left
|
2019-02-22 16:14:46 +03:00 |
|
drcrazy
|
647b126c98
|
Updated mappings
|
2019-02-22 14:36:13 +03:00 |
|
modmuss50
|
b864d551dd
|
Update mappings + more tile work
|
2019-02-22 10:29:11 +00:00 |
|
drcrazy
|
63fe6d2ef4
|
Some luv to rubber stuff )
|
2019-02-22 13:22:07 +03:00 |
|
modmuss50
|
6f9baaeb30
|
Crafting manager fixes
|
2019-02-22 09:47:07 +00:00 |
|
drcrazy
|
a003656419
|
GUI fixes
|
2019-02-22 11:51:55 +03:00 |
|
modmuss50
|
f78b16293f
|
Merge remote-tracking branch 'origin/1.13' into 1.13
|
2019-02-21 23:07:51 +00:00 |
|
modmuss50
|
18b3535607
|
More fixes 637
|
2019-02-21 23:07:44 +00:00 |
|
drcrazy
|
ec919415fb
|
Update strings to textcomponent
|
2019-02-22 02:00:57 +03:00 |
|
modmuss50
|
f51222ac3e
|
Remove some old stuff
|
2019-02-21 22:54:09 +00:00 |
|
modmuss50
|
61b6d30262
|
Bunch of tile work 752
|
2019-02-21 22:46:26 +00:00 |
|
drcrazy
|
1ab52f40c2
|
FIxed import for EventPriority
|
2019-02-22 01:20:54 +03:00 |
|
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 |
|
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
|
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
|
368e2d48df
|
2123 - Gradle setup
|
2019-01-12 19:56:42 +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 |
|
