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
|
8d859bd77b
|
fix some crashes
|
2019-06-12 20:01:44 +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
|
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 |
|
drcrazy
|
48198dbcb3
|
Models for lamps
|
2019-05-02 11:31:07 +03:00 |
|
drcrazy
|
2794c813eb
|
Fix alarm shape
|
2019-05-01 00:40:14 +03:00 |
|
drcrazy
|
e01e9398ea
|
Model for alarm
|
2019-04-30 16:48:43 +03:00 |
|
drcrazy
|
b9ae05afaa
|
IDSU and LESU got models
|
2019-04-30 13:11:00 +03:00 |
|
drcrazy
|
6c8d9e9b74
|
Superconductor cable port from 1.12 to 1.13
|
2019-04-29 17:42:29 +03: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
|
77fa583360
|
More models for energy storages
|
2019-04-26 17:59:37 +03: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 |
|
drcrazy
|
d30d3316e9
|
Energy Crystal dedupe for #1665
|
2019-04-25 16:07:06 +03:00 |
|
drcrazy
|
2afa32ad9e
|
Models for some energy storages
|
2019-04-24 17:36:09 +03:00 |
|
drcrazy
|
86a2056903
|
Models for transformers. Optimus Prime FTW!
|
2019-04-24 17:19:15 +03:00 |
|
drcrazy
|
138c5e6072
|
De-dupe for re-battery. Some work on #1665
|
2019-04-23 20:57:56 +03:00 |
|
drcrazy
|
a506f4b301
|
Updated rubber log usage. Some work on #1706
|
2019-04-23 16:14:54 +03:00 |
|
drcrazy
|
a9acc91eff
|
Models for generators done
|
2019-04-22 18:58:02 +03:00 |
|
drcrazy
|
a1fc56042a
|
Models for generators
|
2019-04-22 17:38:17 +03:00 |
|
modmuss50
|
9f39da44b1
|
things craft
|
2019-04-15 21:54:55 +01: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 |
|
modmuss50
|
98dd01697c
|
Basic test of a grinder recipe
|
2019-04-14 16:17:26 +01:00 |
|
drcrazy
|
c57c8b5287
|
Filter compressor and extractor recipes from JEI if IC2 dedupe is true
|
2019-04-12 12:45:34 +03:00 |
|
drcrazy
|
dde849e19a
|
More debug info
|
2019-04-09 18:04:03 +03:00 |
|
drcrazy
|
f906aaa3cd
|
Fix sap side
|
2019-04-09 17:04:51 +03: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 |
|
drcrazy
|
04f4e51695
|
Models for tier2 machines done.
|
2019-04-09 12:45:29 +03:00 |
|
drcrazy
|
76c2c03a13
|
More models for tier2 machines
|
2019-04-08 16:59:06 +03:00 |
|
drcrazy
|
3892b15685
|
More models for tier2 machines
|
2019-04-05 16:19:39 +03:00 |
|
drcrazy
|
6fecbb9392
|
Solar panels got models
|
2019-04-05 13:19:01 +03:00 |
|
drcrazy
|
4df9d62a90
|
More models
|
2019-04-04 17:29:03 +03:00 |
|
modmuss50
|
73f5554015
|
#releaseBuild
|
2019-04-03 22:40:34 +01: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 |
|
modmuss50
|
925a7b4c0a
|
Add tank support for Fluid Replicator, fixes https://github.com/TechReborn/TechReborn/issues/1698
|
2019-04-03 21:48:44 +01:00 |
|
drcrazy
|
ec2fcf5d6d
|
Removed unused import.
|
2019-04-03 18:24:27 +03:00 |
|
drcrazy
|
b713b43eaf
|
Transformers\Energy storages will use vanilla rotation. Closes #1692
|
2019-04-03 18:23:28 +03:00 |
|
drcrazy
|
c122a480e5
|
Updated forge and mappings
|
2019-04-01 17:22:59 +03: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 |
|
Modmuss50
|
8ad5419ce1
|
Update build.gradle
|
2019-03-31 02:00:27 +01:00 |
|
drcrazy
|
080e305efe
|
Models for iron machines
|
2019-03-29 17:03:10 +03:00 |
|
