modmuss50
|
d18d1b820e
|
397
|
2019-06-04 12:05:18 +01:00 |
|
modmuss50
|
4e03ac893c
|
1147 - Initial auto mappings pass
|
2019-05-26 12:37:59 +01:00 |
|
modmuss50
|
6ab23c4c64
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13
# Conflicts:
# build.gradle
# src/main/java/techreborn/Core.java
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
# src/main/java/techreborn/blocks/BlockMachineCasing.java
# src/main/java/techreborn/blocks/cable/EnumCableType.java
# src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/command/TechRebornDevCommand.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/config/ConfigTechReborn.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.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/IndustrialGrinderRecipes.java
# src/main/java/techreborn/init/recipes/SmeltingRecipes.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/tiles/TileAlarm.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TileLightningRod.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.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/tier3/TileMatterFabricator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/blockstates/items/materials/part.json
# src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
|
2019-04-27 20:32:56 +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
|
8cc611192d
|
Lapotron Crystal dedupe for #1665
|
2019-04-25 16:40:36 +03:00 |
|
modmuss50
|
d45284de2c
|
Add a wrapper around Ingredient to allow for stack sizes
|
2019-04-15 20:46:25 +01:00 |
|
modmuss50
|
1dad4697ba
|
Start moving everything over to the new system
|
2019-04-14 17:01:38 +01:00 |
|
drcrazy
|
2a180cb5c2
|
Commented out tank update()
|
2019-04-09 16:34:54 +03:00 |
|
drcrazy
|
cd48daa152
|
Tier3 machine models done.
|
2019-04-09 15:04:05 +03:00 |
|
modmuss50
|
75f06f6f80
|
Make creative solar panel quicker
|
2019-04-03 22:31:16 +01:00 |
|
modmuss50
|
afe6a179af
|
Optimise matter fab a bit
|
2019-04-03 22:09:44 +01:00 |
|
drcrazy
|
67c9c8721e
|
Changes in GUI for Freezer multiblock. Closes #1672
|
2019-04-01 15:57:08 +03:00 |
|
drcrazy
|
74d1837167
|
Updated freezer multiblock. More work on #1672
|
2019-04-01 15:27:58 +03:00 |
|
drcrazy
|
16ff7af929
|
Updated vacuum freezer multiblock. Some work for #1672
|
2019-03-28 18:09:25 +03:00 |
|
drcrazy
|
01103a26ba
|
Check blast furnace upgrades both on client and server. Closes #1694
|
2019-03-26 14:28:59 +03:00 |
|
modmuss50
|
8ab9724181
|
Fixes #1695
|
2019-03-25 21:41:50 +00:00 |
|
drcrazy
|
8261874665
|
Should fix #1691
|
2019-03-25 14:36:48 +03:00 |
|
modmuss50
|
053324154e
|
Improve creative solar panel
|
2019-03-24 00:54:54 +00:00 |
|
modmuss50
|
fc277000b8
|
Fix super conductor output on aesu's
|
2019-03-23 20:01:30 +00:00 |
|
modmuss50
|
1d78c60e51
|
Superconductor update, adds cables, and new upgrades.
|
2019-03-23 18:03:41 +00:00 |
|
modmuss50
|
0ca18ade97
|
Fix a bug with the auto crafting table
|
2019-03-17 21:50:26 +00:00 |
|
modmuss50
|
425f8921fc
|
Improve auto crafting table performance with large amount of recipes.
|
2019-03-17 17:08:39 +00:00 |
|
modmuss50
|
d7f0e04034
|
Hold shift to go faster in the AESU gui, closes #1686
|
2019-03-17 16:10:20 +00:00 |
|
modmuss50
|
ee0d72223a
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2019-03-17 15:08:03 +00:00 |
|
modmuss50
|
79586e0a62
|
Fix #1688
|
2019-03-17 15:07:14 +00:00 |
|
ralphII
|
9ebec4429f
|
Fix RollingMachine tile not updating its active state (#1687)
|
2019-03-17 14:56:47 +00:00 |
|
modmuss50
|
ac173a5a75
|
Add scrap box to matter fab, fixes https://github.com/TechReborn/TechReborn/issues/1682
|
2019-03-08 13:34:55 +00:00 |
|
drcrazy
|
682b8ccede
|
Do not create already existing block property
|
2019-03-07 11:49:23 +03:00 |
|
modmuss50
|
b560a5483d
|
Dont allow recycling of upgrades
|
2019-03-06 14:41:06 +00:00 |
|
modmuss50
|
8b2c098b27
|
Add some bad code to stop the creative solar panel from exploding when FE is disabled.
|
2019-03-06 14:29:22 +00:00 |
|
modmuss50
|
e7715937cf
|
Increase the AESU max power to 16192
|
2019-03-06 14:28:50 +00:00 |
|
modmuss50
|
3ca9347212
|
Update Auto crafting table to use the better code from the rolling machine, should fix some issues.
|
2019-03-06 14:06:02 +00:00 |
|
modmuss50
|
d7c4f55e6c
|
Auto format imports
|
2019-02-23 19:14:30 +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 |
|
modmuss50
|
a5b2adac78
|
More minor fixes, 370
|
2019-02-22 14:11:55 +00: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 |
|
modmuss50
|
6f9baaeb30
|
Crafting manager fixes
|
2019-02-22 09:47:07 +00:00 |
|
modmuss50
|
18b3535607
|
More fixes 637
|
2019-02-21 23:07:44 +00:00 |
|
modmuss50
|
61b6d30262
|
Bunch of tile work 752
|
2019-02-21 22:46:26 +00: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
|
e03734e66d
|
Fix #1669
|
2019-02-20 19:39:23 +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 |
|
modmuss50
|
c4fff1bf56
|
Should fix #1666
|
2019-02-07 20:26:41 +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 |
|