modmuss50
|
d5e89c5e20
|
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/misc/BlockRubberLog.java
|
2019-11-14 19:03:36 +00:00 |
|
modmuss50
|
a984263b04
|
inital 19w46a port
|
2019-11-14 18:37:42 +00:00 |
|
drcrazy
|
264224a6f9
|
Stripped version of Rubber Log.
|
2019-10-08 13:03:01 +03:00 |
|
modmuss50
|
7f4fb6d80b
|
Cleanup
|
2019-09-22 13:01:34 +01:00 |
|
modmuss50
|
2d8961589d
|
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
# src/main/java/techreborn/client/render/DynamicCellBakedModel.java
|
2019-09-21 12:36:37 +01:00 |
|
modmuss50
|
a4a578917d
|
Update energy api
|
2019-09-16 23:11:56 +01:00 |
|
modmuss50
|
aa6eb60d46
|
Finish porting to new power api
|
2019-09-15 19:14:42 +01:00 |
|
modmuss50
|
8c9c736da9
|
19w37a
|
2019-09-12 16:55:41 +01:00 |
|
modmuss50
|
4f80a8c651
|
start on new power api
|
2019-09-10 14:09:15 +01:00 |
|
modmuss50
|
aa5d81dbe8
|
Fix the nano saber might needs its numbers tweaked. Closes #1816
|
2019-08-26 20:00:59 +01:00 |
|
drcrazy
|
026dedd2e6
|
Refactoring for Iron Furnace
|
2019-08-26 19:03:01 +03:00 |
|
drcrazy
|
154dff4cbf
|
Unused imports + warnings )
|
2019-08-22 01:23:32 +03:00 |
|
modmuss50
|
49b42752a1
|
Fix some server crashes
|
2019-08-21 19:39:10 +01:00 |
|
modmuss50
|
aab3a02184
|
cleanup config field names
|
2019-08-18 17:09:10 +01:00 |
|
drcrazy
|
f9023d7b0f
|
Itemgroup filler moved to init utils.
|
2019-08-13 17:02:34 +03:00 |
|
drcrazy
|
62f1c521f0
|
Jackhammer should work
|
2019-08-13 15:04:19 +03:00 |
|
drcrazy
|
1f9bfabf21
|
Removed unused imports
|
2019-08-12 22:04:24 +03:00 |
|
modmuss50
|
77eee6f5b4
|
Move configs to one class
|
2019-08-12 17:57:00 +01:00 |
|
modmuss50
|
9db1978410
|
Finish porting all recipes to json, cleanup a lot of old code
|
2019-08-12 15:37:45 +01:00 |
|
drcrazy
|
207751996b
|
Fix crash with wrench. Closes #1771
|
2019-08-12 00:58:00 +03:00 |
|
drcrazy
|
56d1d196f0
|
Items use energy to do work. Closes #1770
|
2019-08-12 00:41:44 +03:00 |
|
drcrazy
|
d80bf3a1ce
|
Update import to a proper one
|
2019-08-08 02:17:18 +03:00 |
|
modmuss50
|
aafc42784a
|
Fix Industrial Drill
|
2019-07-29 16:14:17 +01:00 |
|
modmuss50
|
2308ed0f05
|
Fix power durability display
|
2019-07-29 16:02:14 +01:00 |
|
modmuss50
|
dbc89adaf7
|
Tile -> BlockEntity + some more refactors
|
2019-07-22 12:45:13 +01:00 |
|
drcrazy
|
d0dedc6893
|
Cleanup
|
2019-07-22 02:43:22 +03:00 |
|
drcrazy
|
4f1593771e
|
Fixed imports
|
2019-07-15 10:59:08 +03: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
|
6b9f6cb4f8
|
it compiles :D
|
2019-06-12 19:29:04 +01:00 |
|
modmuss50
|
500ff29dbd
|
377
|
2019-06-04 12:13:15 +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
|
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
|
dde849e19a
|
More debug info
|
2019-04-09 18:04:03 +03:00 |
|
drcrazy
|
0feec0612c
|
Done with models for items. Except cell (
|
2019-03-27 03:49:30 +03:00 |
|
drcrazy
|
dd6a06409e
|
Bronze armor and tools
|
2019-03-17 23:47:21 +03:00 |
|
drcrazy
|
f4ef5cc2d4
|
More models for items
|
2019-03-17 21:48:24 +03:00 |
|
drcrazy
|
3cde5c8244
|
Facelift for debug tool
|
2019-03-15 14:14:21 +03:00 |
|
drcrazy
|
f64229efb4
|
Fix tags
|
2019-03-04 12:34:23 +03:00 |
|
drcrazy
|
3314ba33b5
|
Fixed warnings
|
2019-02-25 11:43:43 +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
|
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
|
18b3535607
|
More fixes 637
|
2019-02-21 23:07:44 +00:00 |
|
drcrazy
|
e3be87d517
|
MOre fixes for items. Down to 860
|
2019-02-22 01:13:30 +03: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
|
1567920c8e
|
Updated addInformation method for blocks and items
|
2019-02-21 01:53:33 +03:00 |
|