modmuss50
|
a08ee3d17a
|
Fix manual crashing the game, closes #1754
|
2019-08-08 11:49:11 +01:00 |
|
drcrazy
|
ce56a1da31
|
Renamed some fluids to keep underscores so Prospector can read them.
|
2019-08-08 00:38:30 +03:00 |
|
Shnupbups
|
3af8a63f6c
|
Moved things from assets to data (#1745)
Moved advancements and the rubber plantation loot table to data, where they should be
|
2019-08-07 18:28:57 +01:00 |
|
drcrazy
|
255f277304
|
Should fix armor rendering
|
2019-08-01 14:34:43 +03:00 |
|
Prospector
|
8221be0800
|
Match sizing to cells
|
2019-07-31 21:38:47 -07:00 |
|
Prospector
|
78cbf9a2ac
|
Dynamic bucket textures
|
2019-07-31 16:13:03 -07:00 |
|
drcrazy
|
66a6577dde
|
Inject TR loot into chests
|
2019-07-31 16:17:59 +03:00 |
|
Prospector
|
78b72795c6
|
Fix cell rendering (blessed Grondag for helping immensely)
|
2019-07-30 23:34:51 -07:00 |
|
Prospector
|
07db922127
|
Merge remote-tracking branch 'origin/1.14' into 1.14
|
2019-07-30 15:26:22 -07:00 |
|
Prospector
|
51ed95008f
|
Add more metadata
|
2019-07-30 15:26:09 -07:00 |
|
drcrazy
|
14a78baf5b
|
Initial pass on loot tables for blocks.
|
2019-07-30 17:13:31 +03:00 |
|
drcrazy
|
3b63383012
|
More on REI
|
2019-07-29 02:16:43 +03:00 |
|
drcrazy
|
29aeb50d85
|
Translation for REI recipe categories
|
2019-07-28 23:39:01 +03:00 |
|
drcrazy
|
4e1dfa0018
|
Translation for solar panels
|
2019-07-26 15:22:48 +03:00 |
|
drcrazy
|
e4b0eff608
|
Blockstates and models for fluid blocks
|
2019-07-26 12:41:10 +03:00 |
|
drcrazy
|
ba7372c940
|
Couple of blockstates for fluids
|
2019-07-24 15:43:57 +03:00 |
|
drcrazy
|
f890ac7146
|
And leave behind those who don't know
|
2019-07-19 01:12:48 +03:00 |
|
drcrazy
|
7d05bfbe96
|
Machines we are sending to the skies
|
2019-07-18 16:24:11 +03:00 |
|
drcrazy
|
9ac21ded30
|
Fix lang and parts
|
2019-07-18 00:49:07 +03:00 |
|
drcrazy
|
3e7596bbdb
|
Fixed last texture error re forge bucket png is missing
|
2019-07-13 02:50:59 +03:00 |
|
drcrazy
|
ce72496ddd
|
Models for cables
|
2019-07-12 17:22:22 +03:00 |
|
drcrazy
|
48198dbcb3
|
Models for lamps
|
2019-05-02 11:31:07 +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 |
|
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
|
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
|
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 |
|
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 |
|
drcrazy
|
080e305efe
|
Models for iron machines
|
2019-03-29 17:03:10 +03:00 |
|
drcrazy
|
c45e7fb836
|
Tier1 machines got models
|
2019-03-29 14:41:08 +03:00 |
|
drcrazy
|
5a910c94af
|
Model for alloy smelter
|
2019-03-28 18:09:48 +03:00 |
|
drcrazy
|
84a380f51e
|
Frames&Casings
|
2019-03-27 14:49:09 +03:00 |
|
drcrazy
|
0feec0612c
|
Done with models for items. Except cell (
|
2019-03-27 03:49:30 +03:00 |
|
drcrazy
|
f9c484090f
|
Model for lithium batpack
|
2019-03-26 22:22:24 +03:00 |
|
drcrazy
|
79af5c0a15
|
Models for batteries
|
2019-03-26 21:07:34 +03:00 |
|
drcrazy
|
5353b9c773
|
Upgrades got models
|
2019-03-26 15:29:38 +03:00 |
|
drcrazy
|
38e52f4a0f
|
Migrated to vanilla approach
|
2019-03-25 12:45:20 +03:00 |
|
drcrazy
|
a3b41b9f3f
|
More gem armour and tools
|
2019-03-25 12:43:50 +03:00 |
|
modmuss50
|
1d78c60e51
|
Superconductor update, adds cables, and new upgrades.
|
2019-03-23 18:03:41 +00:00 |
|
drcrazy
|
dd6a06409e
|
Bronze armor and tools
|
2019-03-17 23:47:21 +03:00 |
|