Prospector
9eca97e428
Merge remote-tracking branch 'origin/1.14' into 1.14
2019-07-31 21:39:13 -07:00
Prospector
8221be0800
Match sizing to cells
2019-07-31 21:38:47 -07:00
drcrazy
d53779f2c9
Light cleanup
2019-08-01 03:38:55 +03:00
drcrazy
e7adce612e
Make TR armor repairable
2019-08-01 03:22:14 +03:00
Prospector
78cbf9a2ac
Dynamic bucket textures
2019-07-31 16:13:03 -07:00
modmuss50
779dea4bf8
Enable the buckets again
2019-07-31 20:57:18 +01:00
modmuss50
858adafead
Small tweaks + cleanup
2019-07-31 20:50:17 +01:00
modmuss50
70279c1800
More fluid work
2019-07-31 19:37:17 +01:00
modmuss50
739f4c21e8
Fix multiplayer crashes
2019-07-31 17:34:53 +01:00
drcrazy
398d74dedc
Implosion Compressor recipes
2019-07-31 17:24:36 +03:00
drcrazy
66a6577dde
Inject TR loot into chests
2019-07-31 16:17:59 +03:00
Prospector
35c6c12b72
Remove unnecessary atlas-adding
2019-07-31 00:09:28 -07:00
Prospector
711c95c58e
Merge remote-tracking branch 'origin/1.14' into 1.14
2019-07-30 23:35:02 -07:00
Prospector
78b72795c6
Fix cell rendering (blessed Grondag for helping immensely)
2019-07-30 23:34:51 -07:00
drcrazy
5406d08f5d
Cleanup and warnings
2019-07-31 02:41:54 +03:00
drcrazy
d1178df673
Ore drop is not working (cry)
2019-07-31 02:13:53 +03: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
modmuss50
a1674cb8a8
More recipes ported
2019-07-30 21:16:44 +01:00
modmuss50
3c29c06d39
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-07-30 20:02:57 +01:00
modmuss50
9c9c5f7ac9
A few more recipes
2019-07-30 20:02:40 +01:00
drcrazy
14a78baf5b
Initial pass on loot tables for blocks.
2019-07-30 17:13:31 +03:00
modmuss50
dd7ca7dc99
more recipes
2019-07-30 13:05:25 +01:00
modmuss50
9a92325da3
add the mess of the recipe generator code
2019-07-30 12:13:17 +01:00
modmuss50
7e2bf482a2
sawmill recipes
2019-07-30 12:12:56 +01:00
modmuss50
6fc7b7096a
auto generated some compressor and grinder recipes
2019-07-30 11:58:07 +01:00
modmuss50
b5d5ef2ca0
Some more recipes
2019-07-30 01:58:41 +01:00
modmuss50
6c0f8afa68
Some grinder recipes
2019-07-30 00:29:50 +01:00
drcrazy
aa7464ad4a
Moved recipe utility methods to RecipeUtils
2019-07-30 01:46:12 +03:00
drcrazy
878734e4ad
Blast furnace recipes moved to 1.14
2019-07-29 21:24:47 +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
5e19889c96
Some hologram changes, the button wont work.
2019-07-29 15:22:48 +01:00
drcrazy
13ed4d1c22
Typo and license
2019-07-29 17:18:52 +03:00
drcrazy
661698593e
Some blast furnace recipes
2019-07-29 17:14:34 +03:00
modmuss50
e4c2f1be6d
Fix alarm culling and bounding boxes
2019-07-29 14:39:01 +01:00
modmuss50
09662db11a
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-07-29 14:31:42 +01:00
modmuss50
27207cb498
Expand fluid ingredient to allow limiting to specific fluid holder types
2019-07-29 14:31:21 +01:00
drcrazy
c4a3e5ecf5
Failed attempt to make cell recipe in reactor
2019-07-29 11:25:44 +03:00
drcrazy
213c1b6faa
Some chemical reactor recipes
2019-07-29 11:09:37 +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
modmuss50
b89a52e594
Fluid color in cell changes color based on biome's water color + some other fixes and changes
2019-07-28 17:29:01 +01:00
modmuss50
0da3168bbf
Fluid ingredients + some other work around this area
2019-07-28 17:14:38 +01:00
modmuss50
0118d5a999
Refactor machine ingredients
2019-07-28 14:50:06 +01:00
drcrazy
a7de6b428a
Cleanups
2019-07-27 01:52:51 +03:00
drcrazy
4e1dfa0018
Translation for solar panels
2019-07-26 15:22:48 +03:00
drcrazy
d76d637781
Fix solar panel loading NPE
2019-07-26 15:12:47 +03:00
drcrazy
f28462a9e6
Alloy smelter recipes
2019-07-26 14:08:03 +03:00
drcrazy
e4b0eff608
Blockstates and models for fluid blocks
2019-07-26 12:41:10 +03:00
drcrazy
f06e1a8673
ModSounds refactored to follow items, blocks and fluids
2019-07-26 11:45:30 +03:00
drcrazy
316def3086
Cables are working
2019-07-26 02:37:02 +03:00
drcrazy
cc91888c4a
More alloys
2019-07-25 15:59:43 +03:00
drcrazy
80f2440323
Unused imports and Lightning rod
2019-07-25 15:20:57 +03:00
modmuss50
52da17dfd5
Start on REI support, very basic right now, but it will help a lot when adding recipes.
2019-07-25 13:14:46 +01:00
modmuss50
a80d2183f9
Fix iron furnace
2019-07-25 00:16:49 +01:00
modmuss50
fc56eeaf61
Slot config
2019-07-25 00:10:11 +01:00
modmuss50
6a93c3fd46
more misc fluid work, gonna leave most of this untill we have an offical or new api
2019-07-24 19:06:21 +01:00
drcrazy
0742abb840
Start of alloy smelter recipes
2019-07-24 16:33:17 +03:00
drcrazy
ba7372c940
Couple of blockstates for fluids
2019-07-24 15:43:57 +03:00
drcrazy
c0164302e9
Smelting recipes done.
2019-07-24 13:01:45 +03:00
modmuss50
8964c5aceb
Basic Dynamic cell rendering
2019-07-24 01:37:05 +01:00
modmuss50
fb2a5a15b9
Fix fluid rendering and physics
2019-07-23 23:33:51 +01:00
modmuss50
9b46e3237e
move to silk fluids
2019-07-23 21:30:57 +01:00
modmuss50
85554bcfe2
Some more fixes to fluids
2019-07-23 21:09:10 +01:00
modmuss50
83bf6add1e
Large amount of fluid work
2019-07-23 20:46:07 +01:00
modmuss50
1e52477b9e
small fixes
2019-07-23 17:51:38 +01:00
drcrazy
56503ad117
Start of melting recipes
2019-07-23 17:21:17 +03:00
drcrazy
eb6a8b9ceb
Done with crafting table recipes. New items don't have them yet.
2019-07-23 17:04:55 +03:00
drcrazy
4ec41d0bdc
Recipe for dust from small dusts
2019-07-23 14:59:45 +03:00
drcrazy
54ad3360fd
Moar storage recipes
2019-07-23 01:50:01 +03:00
drcrazy
f1ddc86bdd
Reorder crafting table recipes
2019-07-23 01:20:04 +03:00
drcrazy
3aa40608f7
Added storage block from ingots recipe + subfodlers
2019-07-22 18:24:03 +03:00
drcrazy
9ec95d7147
uu-matter got some buffs during move to json
2019-07-22 17:26:58 +03:00
modmuss50
dbc89adaf7
Tile -> BlockEntity + some more refactors
2019-07-22 12:45:13 +01:00
modmuss50
7f8674f1ca
fix syncID issues, should fix a lot of issues with the inv handing.
2019-07-22 11:54:13 +01:00
modmuss50
50c13bafdc
1.14.4
2019-07-22 11:31:24 +01:00
drcrazy
d0dedc6893
Cleanup
2019-07-22 02:43:22 +03:00
drcrazy
1639fd63a3
Remove excessive modifiers
2019-07-22 01:27:30 +03:00
drcrazy
70d6c8f102
Of the final day
2019-07-19 11:57:18 +03:00
drcrazy
f890ac7146
And leave behind those who don't know
2019-07-19 01:12:48 +03:00
drcrazy
ed6cfa916b
Above us all
2019-07-18 16:24:29 +03:00
drcrazy
7d05bfbe96
Machines we are sending to the skies
2019-07-18 16:24:11 +03:00
drcrazy
7977a8e73b
Few warnings and moar recipes
2019-07-18 01:32:37 +03:00
drcrazy
9ac21ded30
Fix lang and parts
2019-07-18 00:49:07 +03:00
drcrazy
db9db5b77d
More tool recipes
2019-07-17 17:17:15 +03:00
drcrazy
d9cbbfa0fc
Gem armor and tools
2019-07-17 16:24:37 +03:00
drcrazy
9db0e068e1
Recipe for cables
2019-07-16 23:06:32 +03:00
drcrazy
8b37482494
Just a few recipes
2019-07-16 13:58:29 +03:00
drcrazy
3edff88ee0
Ores and Rubber trees are spawn on Overworld and Nether
2019-07-16 02:25:07 +03:00
drcrazy
7e4d65ffa0
Tags for rubber stuff
2019-07-16 01:17:29 +03:00
drcrazy
c2e871a31b
They grow. But not sustain yet (
2019-07-15 23:30:10 +03:00
drcrazy
d6788c8da5
Moved misc blocks to their own package. Start of rubber stuff
2019-07-15 17:24:31 +03:00
drcrazy
4f1593771e
Fixed imports
2019-07-15 10:59:08 +03:00
drcrazy
5d93843a1e
Formatting
2019-07-15 10:43:08 +03:00
drcrazy
57d0d6d3f0
Improvements for BlockCable
2019-07-15 02:44:27 +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
modmuss50
d6e64364fc
Power fixes
2019-07-10 22:34:55 +01:00
modmuss50
e26d1edc52
Configs
2019-07-10 21:56:22 +01:00
modmuss50
a7fbc3017b
more inv fixes
2019-07-04 12:16:17 +01:00
modmuss50
42637df12d
Fix nuke
2019-07-01 00:48:20 +01:00
modmuss50
7dc6dddc51
Refactor out inv wrapper
2019-07-01 00:39:13 +01:00
modmuss50
18950e0b29
1.14.3 + more recipe fixes
2019-07-01 00:24:12 +01:00
modmuss50
5f134a7379
Fixes
2019-06-30 22:56:56 +01:00
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
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
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
16ff7af929
Updated vacuum freezer multiblock. Some work for #1672
2019-03-28 18:09:25 +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
d3c6d43fee
Tags for rubber stuff
2019-03-26 18:10:18 +03:00
drcrazy
5353b9c773
Upgrades got models
2019-03-26 15:29:38 +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
modmuss50
17427e675e
Fixes https://github.com/TechReborn/TechReborn/issues/1693 and Fixes https://github.com/FTBTeam/FTB-Sky-Odyssey/issues/102
2019-03-25 21:37:27 +00:00
drcrazy
8261874665
Should fix #1691
2019-03-25 14:36:48 +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
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
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
1c86c6c031
Tree grow from sapling. Not correctly though (
2019-03-17 21:39:07 +03: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
drcrazy
704ad8df07
Rubber tree can grow now.
2019-03-15 16:36:34 +03:00
drcrazy
bfd6f16504
Rubber log works. Need to doublecheck sap side
2019-03-15 15:14:19 +03:00
drcrazy
3cde5c8244
Facelift for debug tool
2019-03-15 14:14:21 +03:00
drcrazy
5c6b268dcb
Some polishing for Rubber Tree feature
2019-03-14 12:58:23 +03:00
drcrazy
889e576683
Started porting for Rubber Tree world gen feature
2019-03-13 18:13:49 +03:00
drcrazy
d2db53f6f2
More rubber stuff
2019-03-13 14:57:49 +03:00
drcrazy
9079765bc9
Easy part of textures for materials done
2019-03-13 13:53:31 +03:00
drcrazy
8b9f877d20
More materials got textures
2019-03-13 12:58:22 +03:00
drcrazy
92530b08b1
Ingots got textures
2019-03-12 14:41:17 +03:00
drcrazy
c58bf04667
Cleanup of migrated blocks\items
2019-03-11 17:15:02 +03:00
drcrazy
0db5a756b5
Parts got textures
2019-03-11 17:08:15 +03:00
drcrazy
3667f56bd8
Couple of items got their textures back including itemGroup
2019-03-11 13:42:51 +03:00
drcrazy
96bbe75c60
Removed unused imports
2019-03-11 02:22:49 +03: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
46b1e920e9
Add shear mode to chainsaw, closes #1668
2019-03-06 15:32:55 +00:00
modmuss50
73465f4b38
Add toggle for drill AOE effect, shift click to enable/disable. Fixes #1670
2019-03-06 15:18:44 +00:00
modmuss50
99d4350428
Much better wood searching, should now handle large and complex trees well, closes #1680
2019-03-06 15:11:19 +00:00
modmuss50
76c81c9e90
Fix #1679
2019-03-06 14:53:50 +00:00
modmuss50
8270f57e6f
Fix #1674
2019-03-06 14:48:53 +00:00
modmuss50
b560a5483d
Dont allow recycling of upgrades
2019-03-06 14:41:06 +00:00
modmuss50
b62b8cc248
Fix #1678
2019-03-06 14:34:16 +00:00
drcrazy
4650f3e375
Moved remainings of postInit to loadComplete
2019-03-06 17:34:10 +03: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
drcrazy
d29eb5706d
Storage blocks got their textures
2019-03-05 17:27:28 +03:00
drcrazy
a4d9401040
At least block models could be in subfolders
2019-03-04 18:14:41 +03:00
drcrazy
d6d0515a1b
Blockstate+models for ores
2019-03-04 17:37:01 +03:00
drcrazy
f64229efb4
Fix tags
2019-03-04 12:34:23 +03:00
modmuss50
38eca7b3e8
Fix lang
2019-03-02 18:57:58 +00:00
modmuss50
ff1370a3fd
Fix opening guis, still needs some work, but atleast it works now
2019-03-02 18:45:33 +00:00
drcrazy
f94d6630fb
More scrapbox recipes and less spam
2019-03-02 03:36:04 +03:00
drcrazy
97b517580a
Fixed license
2019-03-01 18:59:11 +03:00
drcrazy
f6579f5c2c
Rubber Plank stairs got textures
2019-03-01 17:29:19 +03:00
drcrazy
f6d94647e2
Rendering for grinder
2019-03-01 15:36:04 +03:00
drcrazy
3ce99b987f
TE should register now
2019-03-01 14:28:32 +03:00
drcrazy
0666ade222
Fixed typo
2019-02-28 18:04:11 +03:00
drcrazy
59b0633353
Added ArmorMaterials
2019-02-27 17:58:00 +03:00
drcrazy
eb51e07998
ToolTier values migrated in a dirty way
2019-02-26 15:39:10 +03:00
drcrazy
927d3637a5
FIxed couple of warnings
2019-02-26 14:47:13 +03:00
drcrazy
a979ff747f
Nuke is back
2019-02-26 14:28:08 +03:00
modmuss50
5397b26cf2
Machine cases drop them selves to fix https://github.com/FTBTeam/FTB-Ultimate-Reloaded/issues/90
2019-02-25 17:25:06 +00:00
drcrazy
ba220246f0
Dispenser should dispense scrapboxes again
2019-02-25 15:37:03 +03:00
drcrazy
767ce10bf1
Revert wrong changes
2019-02-25 11:51:57 +03:00
drcrazy
3314ba33b5
Fixed warnings
2019-02-25 11:43:43 +03:00
modmuss50
4d32e6e292
Horrible quick port of gui handling, tiles still need fixing first tho
2019-02-24 00:13:27 +00:00
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
drcrazy
5bc08557b3
Migration work on TR armor
2019-02-20 23:12:36 +03:00
modmuss50
e03734e66d
Fix #1669
2019-02-20 19:39:23 +00:00
modmuss50
4aae2422fa
Fix LED lights not using correct cables
2019-02-15 19:12:11 +00:00
modmuss50
65b95afed8
After complaints that the manual is a scam, you can now refund it back into its ingredients.
...
Can be disabled in config
2019-02-15 18:33:45 +00:00
drcrazy
8b82259871
Iron and gold armor recycling in blast furnace.
2019-02-15 14:19:48 +03:00
modmuss50
4addff892b
Create a WrenchContext to allow for ic2 mod compat to register support for using ic2's wrench
2019-02-14 15:58:33 +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
drcrazy
3fb799e544
Removed unused imports
2019-02-11 15:35:37 +03:00
drcrazy
0fa72c4fc3
More efficient diamond grinding and armor recycling
2019-02-11 15:32:24 +03:00
modmuss50
b9169c5397
Merge remote-tracking branch 'origin/1.12' into 1.12
2019-02-07 20:26:52 +00:00
modmuss50
c4fff1bf56
Should fix #1666
2019-02-07 20:26:41 +00:00
modmuss50
4797d64f5b
#releaseBuild fix Advanced alloy
2019-02-05 00:15:43 +00:00
modmuss50
6595bb80c5
Move type registry to before the ic2 dict, add advanced alloy to classic dedupe.
2019-02-04 21:51:21 +00:00
modmuss50
8549129870
Dont register refined iron smelting recipe with classic dedupe enabled
2019-02-04 21:27:49 +00:00
modmuss50
f836fb84c7
Move IC2_PROFILE to a config, the event is fired too early to be used.
2019-02-04 20:53:33 +00:00
modmuss50
6916de2ad7
Added support for ic2 exp classic profile
2019-02-04 20:19:51 +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
coderbot
3e44fc369f
Transformers now declare that they can output multiple packets per tick
2019-01-28 17:38:02 -08:00
modmuss50
12b892f0dc
Fix Alarm recipe with IC2 Dedupe
2019-01-27 01:42:52 +00:00
modmuss50
8505616651
Fix fusion coil not being crafted with ic2 de-dupe
2019-01-26 19:06:51 +00:00
modmuss50
0228d72179
Always add refined iron ingot to smelting, I forgot to remove it
2019-01-24 21:38:21 +00:00
modmuss50
f4a24d7c25
Fixes to retro gen
2019-01-24 21:35:39 +00:00
modmuss50
5a9349ced4
Pull back power output on Thermal gen as I made it a bit too much last commit. Now 16
2019-01-24 21:26:56 +00:00
Modmuss50
bc1e2ca7eb
Thermal Generator now outputs 32 eu/tick
2019-01-20 21:14:15 +00:00
modmuss50
498d675f30
Remove Refined Iron from ic2 duplicates
2019-01-18 16:20:34 +00:00
drcrazy
292664b8e1
Fixed i18n usage on server. Closes #1655
2019-01-16 18:07:48 +03:00
drcrazy
7cc0c472f9
Adjustments for updated power output icon.
2019-01-14 15:11:26 +03:00
drcrazy
1a8c730591
Plasma generator got its icon in JEI. Closes #1653
2019-01-14 14:10:26 +03:00
drcrazy
8a03b0eca2
More on #1654
2019-01-14 14:04:58 +03:00
drcrazy
381fbfb463
Fix JEI info for sawmill energy usage. Some work for #1654
2019-01-14 14:04:22 +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
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
modmuss50
95ef8e4df5
#releaseBuild
2019-01-03 14:05:49 +00:00
drcrazy
d67f670141
addHologramButton is now in RC
2018-12-30 22:50:03 +03:00
drcrazy
3df454789f
Draw hologram button on background
2018-12-30 22:31:52 +03:00
drcrazy
03fdbe49a6
Power bar tooltip should be on top of hologram button
2018-12-30 02:48:35 +03:00
drcrazy
d41da2457f
Lock button works again
2018-12-30 01:19:23 +03:00
drcrazy
b33b3d8745
Updates due to TR GUI builder gone.
2018-12-28 18:07:56 +03:00
coderbot16
fbec0c89c2
Finalize IC2 electric item support ( #1644 )
...
* Item charging no longer uses CapabilityEnergy, now fully uses ExternalPowerSystems
* Remove accidental update from build.gradle
* Remove some unused imports
* Use requestEnergyFromArmor in all powered tools
2018-12-28 09:25:40 +00:00
drcrazy
5724fc3d8c
Rolling machine can now charge from battery. Closes #1645
2018-12-28 12:24:05 +03:00
coderbot16
a766cdfa53
Remove almost all explicit uses of CapabilityEnergy ( #1643 )
...
* Battery packs (ItemLithiumBackpack/ItemLapotronPack) still use CapEnergy explicitly, but don't charge IC2 items.
* Note: Before we can remove FE, we have to modify StackInfoHUD and ItemUtils in RebornCore.
2018-12-27 13:58:55 +00:00
modmuss50
c064b72bc5
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.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/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.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/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.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/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.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/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.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/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.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/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
2018-12-26 16:08:12 +00:00
modmuss50
4440c2f305
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/TechReborn.java
# src/main/java/techreborn/blocks/BlockNuke.java
# src/main/java/techreborn/blocks/BlockOre.java
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
# src/main/java/techreborn/client/RegisterItemJsons.java
# src/main/java/techreborn/client/container/builder/BuiltContainer.java
# src/main/java/techreborn/client/container/builder/ContainerBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerPlayerInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java
# src/main/java/techreborn/client/container/builder/slot/FilteredSlot.java
# src/main/java/techreborn/client/container/builder/slot/SpriteSlot.java
# src/main/java/techreborn/client/container/builder/slot/UpgradeSlot.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiBase.java
# src/main/java/techreborn/client/gui/GuiBlastFurnace.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/GuiDigitalChest.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiFusionReactor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGenerator.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.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/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java
# src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java
# src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java
# src/main/java/techreborn/client/gui/slot/elements/ConfigSlotElement.java
# src/main/java/techreborn/client/gui/slot/elements/ElementBase.java
# src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/ISprite.java
# src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java
# src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java
# src/main/java/techreborn/client/gui/slot/elements/Sprite.java
# src/main/java/techreborn/compat/CompatManager.java
# src/main/java/techreborn/compat/ICompatModule.java
# src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
# src/main/java/techreborn/compat/jei/BuiltContainerTransferInfo.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.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/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.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/industrialGrinder/IndustrialGrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/BlockBreakHandler.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModItems.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java
# src/main/java/techreborn/init/recipes/ChemicalReactorRecipes.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/IndustrialSawmillRecipes.java
# src/main/java/techreborn/init/recipes/RollingMachineRecipes.java
# src/main/java/techreborn/init/recipes/ScrapboxRecipes.java
# src/main/java/techreborn/items/ItemDestructopack.java
# src/main/java/techreborn/items/ItemFrequencyTransmitter.java
# src/main/java/techreborn/items/ItemManual.java
# src/main/java/techreborn/items/ItemMissingRecipe.java
# src/main/java/techreborn/items/ItemScrapBox.java
# src/main/java/techreborn/items/ItemTechManual.java
# src/main/java/techreborn/items/ItemUUmatter.java
# src/main/java/techreborn/items/ItemUpgrade.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/ingredients/ItemDusts.java
# src/main/java/techreborn/items/ingredients/ItemDustsSmall.java
# src/main/java/techreborn/items/ingredients/ItemGems.java
# src/main/java/techreborn/items/ingredients/ItemIngots.java
# src/main/java/techreborn/items/ingredients/ItemNuggets.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/ingredients/ItemPlates.java
# src/main/java/techreborn/items/ingredients/ItemUUmatter.java
# src/main/java/techreborn/items/tool/ItemDebugTool.java
# src/main/java/techreborn/items/tool/ItemTreeTap.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTechManual.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/lib/ModInfo.java
# src/main/java/techreborn/proxies/ClientProxy.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/TileChunkLoader.java
# src/main/java/techreborn/tiles/TileDigitalChest.java
# src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java
# src/main/java/techreborn/tiles/TileMatterFabricator.java
# src/main/java/techreborn/tiles/TileQuantumChest.java
# src/main/java/techreborn/tiles/TileQuantumTank.java
# src/main/java/techreborn/tiles/cable/TileCable.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java
# src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java
# src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java
# src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java
# src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java
# src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java
# src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java
# src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java
# src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java
# src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java
# src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.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/tier1/TileScrapboxinator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
# src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java
# src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java
# src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java
# src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java
# src/main/java/techreborn/utils/StackWIPHandler.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
2018-12-26 16:08:04 +00:00
drcrazy
fbc8ceb1ed
AESU poweroutput icon fixed
2018-12-22 13:06:03 +03:00
drcrazy
e2c8284bc5
Added config for Rubber Tree plantations in villages. Closes #1639
2018-12-19 18:22:45 +03:00
drcrazy
3b1b0b59da
Removed more excessive this-es.
2018-12-17 18:09:40 +03:00
drcrazy
6e237a4fcb
Removed excessive this-es. WIP
2018-12-17 15:53:35 +03:00
drcrazy
15cf0d49ad
scrap slot same is usual slot.
2018-12-17 15:26:50 +03:00
drcrazy
83fd409e94
Fixed license and unused imports
2018-12-12 16:14:36 +03:00
modmuss50
0d9e98b370
Cleanup ic2 support
2018-12-09 00:24:52 +00:00
modmuss50
cb292205dd
Dont force a crash, just let it happen naturally,
2018-12-08 23:37:31 +00:00
modmuss50
a04760bac1
Tweak incompatible message
2018-12-08 22:34:15 +00:00
modmuss50
7433eb7630
Fix bad rename
2018-12-08 22:05:36 +00:00
modmuss50
bb5a3e2647
Clean up ic2 support
2018-12-08 20:48:21 +00:00
modmuss50
7db621fbed
Abstract ic2 in RebornCore, rewrite Reborn Core's configs
2018-12-08 20:15:20 +00:00
drcrazy
5d4ffab5de
Adjusted JEI clickareas
2018-12-05 17:50:54 +03:00
drcrazy
7c1daf83e0
Updated JEI button location.
2018-12-04 18:12:05 +03:00
modmuss50
f91493dbc5
Move gui code to reborn core
2018-12-02 16:13:00 +00:00
modmuss50
b399e211fa
Move container builder to Reborn Core
2018-12-02 01:15:03 +00:00
modmuss50
8334de2604
Fix config going into wrong dir
2018-11-27 18:01:50 +00:00
modmuss50
385a5ea8b5
Include TechReborn Mod Compatibility using jar in jar
2018-11-16 16:51:26 +00:00
modmuss50
aa0ffe7559
Stage one of moving compat code out into a separate project
2018-11-16 15:44:33 +00:00
modmuss50
a27007e1a3
Clean up of compat code
2018-11-15 12:29:42 +00:00
modmuss50
f808c61a51
Use mekanism's gas registry to register mek gases to be used in the gas turbine. Closes #1575
...
Remove some old psi compat code as well as it was never used
2018-11-15 12:24:42 +00:00
modmuss50
7e5ec8d70f
Fix retro gen. Fixes #1622
2018-11-15 11:06:53 +00:00
drcrazy
7ce4a022af
Cables got tooltip update. Closes #1627
2018-11-07 03:03:26 +03:00
drcrazy
9f3a3eb026
Refactoring of tooltips
2018-11-06 18:12:19 +03:00
drcrazy
941629e790
Progress for matter fabricator finally works. Closes #1630
2018-11-06 17:46:07 +03:00
drcrazy
c7db26c21e
Legacy code removed
2018-11-06 12:56:16 +03:00
drcrazy
430f534b3a
Updated JEI compat to use VanillaTypes once again.
2018-11-05 13:03:00 +03:00
drcrazy
7ab571bcc7
More marble dust required to make calcite dust. Closes #1629
2018-11-05 12:39:22 +03:00
drcrazy
df13aeeba2
Should fix electric furnace progress + formatting. Closes #1621
2018-10-29 17:40:16 +03:00
drcrazy
50e35578a2
Matter fabricator got progress arrow back. Closes #1617
2018-10-23 17:54:12 +03:00
drcrazy
26e09d1687
WaterMill and neutron reflectors deduplicated. Closes #1620
2018-10-23 17:26:39 +03:00
drcrazy
066c6ba3e0
INitial work on #1620
2018-10-23 13:44:06 +03:00
drcrazy
bdd961e0a7
Rubber wood block will give more slabs and stairs. Closes #1619
2018-10-19 16:10:23 +03:00
Prospector
0cbefc63d2
Rename 1 thing
2018-10-17 18:21:57 -07:00
modmuss50
7fe876fe73
Fix #1614
2018-10-07 21:53:46 +01:00
modmuss50
20b1874e2c
Fix #1602
2018-10-07 21:36:39 +01:00
modmuss50
a0ee459d13
Make empty cells require a glass pane due to thermal expansion changing their gear recipes to clash. Config to disable + add old recipe to rolling machine
2018-10-07 21:31:35 +01:00
modmuss50
66e60655bf
Work towards https://github.com/TechReborn/TechReborn/issues/1614 still need to move all the other recipes that need it to use the ore dict
2018-10-07 21:20:18 +01:00
drcrazy
4612ab334c
Cleanup of model registration
2018-10-04 12:38:34 +03:00
drcrazy
ec0724b15f
Refactoring for model registration
2018-10-03 18:26:47 +03:00
drcrazy
4ea5d2a818
Fix model registration. Moved items reg to event.
2018-10-03 17:34:03 +03:00
drcrazy
e9c2857db8
Initial work on event based registration
2018-09-26 18:28:59 +03:00
modmuss50
6713cd6296
Initial removal of itemblocks, wrench now drops the item with the nbt of the tile.
...
This is still WIP but mostly seems to work
2018-09-25 17:51:25 +01:00
drcrazy
d06bd5eef9
Improvements for debug tool and solar panel
2018-09-25 16:00:44 +03:00
drcrazy
1e9cfa07b6
Removed excessive setCreativeTab from blocks
2018-09-25 13:56:59 +03:00
drcrazy
f600432f05
All machines are now in enum.
2018-09-25 13:39:41 +03:00
drcrazy
20a385f6ca
Fix block break
2018-09-25 03:42:12 +03:00
drcrazy
25f06384f4
Energy storage enum-ed
2018-09-25 03:09:56 +03:00
drcrazy
f2d8891bd5
Fix build
2018-09-25 02:47:46 +03:00
drcrazy
f7ecfd0574
Item\Fluid storages went to enum.
2018-09-25 02:41:30 +03:00
drcrazy
809c02934a
Moved generators to enum
2018-09-24 16:49:44 +03:00
drcrazy
86a2612b97
Moved some machines to enum
2018-09-24 16:13:35 +03:00
drcrazy
dd94ff31c9
Blocks moved to TRContent
2018-09-24 15:45:48 +03:00
drcrazy
9f9595f955
Moved items into content
2018-09-24 14:28:58 +03:00
drcrazy
bf7f7ba871
Renamed ModBlocks to TRBlocks
2018-09-23 23:21:19 +03:00
drcrazy
f02b24f813
Fixed cables rendering
2018-09-22 16:50:33 +03:00
drcrazy
7a005f7494
Sorting and renaming for cables and panels. Still not rendering
2018-09-21 19:44:30 +03:00
modmuss50
e068ca018c
flatten cables, they dont render correctly in world yet
2018-09-20 19:49:25 +01:00
drcrazy
a5a0d03591
Solar panels flattened.
2018-09-20 16:42:32 +03:00
modmuss50
5377941e10
Fixes issues with ores, closes https://github.com/FTBTeam/FTB-Continuum/issues/461
2018-09-19 16:46:32 +01:00
drcrazy
b7a0854cae
MOre work on solar panels. Blockstate json isn't ready yet.
2018-09-19 18:24:35 +03:00
drcrazy
10e91deeff
Iron machines got their names back. Closes #1606
2018-09-19 13:06:41 +03:00
drcrazy
4245decc3c
Some work on solar panels flattening
2018-09-18 15:32:13 +03:00
drcrazy
0918bceb23
Call getHeatFromState in a static way.
2018-09-18 12:45:29 +03:00
ProfessorProspector
b4ca82a97b
Move machine casings over and temp gen localization
2018-09-17 17:07:11 -07:00
drcrazy
0c54a4538e
More cleanup after refactoring
2018-09-17 16:42:17 +03:00
drcrazy
bdf53c9094
Add block info into debug tool output
2018-09-17 15:55:09 +03:00
drcrazy
89ca71386f
re-Structured assets for items a little bit
2018-09-17 14:32:55 +03:00
drcrazy
be23d2af6e
Cleanup after refactoring
2018-09-17 13:16:49 +03:00
modmuss50
524770abba
Move around some classes that didnt need their own high level package
2018-09-17 07:34:13 +01:00
modmuss50
f6d5d88a4b
rename TileLegacyMachineBase to TileMachineBase
2018-09-17 07:31:41 +01:00
ProfessorProspector
714ddd075b
Update logo & mcmod.info
2018-09-16 20:41:42 -07:00
ProfessorProspector
0b963dcda9
Continue to make sense of things... this mod's a mess lol
2018-09-16 20:31:01 -07:00
ProfessorProspector
d98802ee1b
Add example tags based on Lex's example
2018-09-16 18:56:03 -07:00
ProfessorProspector
c568876caa
Revert ore dict comment & remove useless stuff
2018-09-16 14:01:00 -07:00
ProfessorProspector
e5736669ca
Refactoring & cleaning
2018-09-16 13:48:51 -07:00
ProfessorProspector
874559c21e
Try to make things make more sense
2018-09-15 19:36:37 -07:00
drcrazy
f6c143dce3
Flattened casings
2018-09-16 03:34:26 +03:00
drcrazy
1d4116a215
Flattened frames
2018-09-14 17:16:59 +03:00
modmuss50
5307fd4528
Fix fluid config showing when it shouldn't
2018-09-13 20:01:35 +01:00
modmuss50
01a3663b11
more changes to the inventory stuff
2018-09-13 19:56:32 +01:00
modmuss50
01644e4f65
Fix slot config, some changes to the way Inventory works as well to allow for this.
2018-09-13 19:33:14 +01:00
drcrazy
305f74b107
Storage blocks flattened
2018-09-12 16:56:24 +03:00
drcrazy
7393a8bdd6
Ores flattened
2018-09-12 16:15:05 +03:00
drcrazy
916c8c5ba4
Initial work on ores flattening
2018-09-10 16:45:04 +03:00
drcrazy
35669641ba
Changed translation names for ingredients
2018-09-10 13:42:22 +03:00
drcrazy
1b3bf6f5c2
Cleaned up translation keys
2018-09-07 17:37:49 +03:00
drcrazy
b05c2e948f
Reorganized items json registration
2018-09-07 16:27:19 +03:00
Modmuss50
3444c05c40
IInventory > IItemHandler
...
Most things should work, but havent been tested
Slot config will not work just yet
2018-09-07 14:05:19 +01:00
drcrazy
645606c5c4
itemRubber already oredicted in proper class
2018-09-07 15:25:10 +03:00
drcrazy
6d3d1f2df2
Organized items. MOved creative tab setter to parent.
2018-09-07 14:51:41 +03:00
drcrazy
c56da8cf18
Use static fuse in static way. cherry-pick from: 8cac9a9315
2018-09-07 12:21:34 +01:00
drcrazy
8cac9a9315
Use static fuse in static way.
2018-09-07 13:31:38 +03:00
Modmuss50
67226de701
fix compile changes
2018-09-05 18:43:33 +01:00
Modmuss50
6060a97855
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
...
# Conflicts:
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/client/container/ContainerPda.java
# src/main/java/techreborn/client/gui/TRBuilder.java
# src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
# src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeCategory.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialElectrolyzer/IndustrialElectrolyzerRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java
# src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java
# src/main/java/techreborn/init/ModBlocks.java
# src/main/java/techreborn/init/ModTileEntities.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
# src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
# src/main/resources/assets/techreborn/lang/en_us.lang
# src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json
# src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json
# src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json
# src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json
# src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json
# src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json
2018-09-05 17:49:49 +01:00
drcrazy
6d4616b38e
Updated constructor parameter name
2018-09-04 17:37:32 +03:00
drcrazy
b41783054e
Fixed translation keys and update TR discord link
2018-09-04 17:25:45 +03:00
drcrazy
79ff8ee5b0
Cleaned up code dupes
2018-09-04 13:46:51 +03:00
drcrazy
a05ba25f31
Flattened upgrades
2018-09-04 13:26:09 +03:00
drcrazy
a40635e75f
Renamed ModItems to TRItems. Sorted members inside it.
2018-09-03 17:46:21 +03:00
drcrazy
0443ad4a3a
Destructopack is a separate item
2018-09-03 17:01:46 +03:00
drcrazy
33b9f697dc
Merged all ingredients into single class
2018-09-03 14:49:59 +03:00
drcrazy
0b1733b733
DUsts and dustsSmall are combined into single class
2018-09-03 14:00:06 +03:00
drcrazy
f01d75404c
Buffed oreCoal processing in Industrial Grinder
2018-09-02 23:45:02 +03:00
Modmuss50
9a19223c84
Revert "Updated JEI compat to use VanillaTypes"
...
This reverts commit c41b889
Done becuase VanillaTypes are not in a stable build of JEI
2018-09-02 14:02:08 +01:00
drcrazy
08cee81d54
Updated machine names in JEI.
2018-09-01 03:01:51 +03:00
drcrazy
3190185a54
Cleaned fluid translation keys.
2018-09-01 02:46:25 +03:00
Modmuss50
53ad3a7a60
Add configs to the nuke, closes #1594
2018-08-31 16:32:16 +01:00
drcrazy
edf0227598
CLeanup of blocks
2018-08-31 15:36:39 +03:00
Modmuss50
1b0ff5f95a
Fix small naming issue
2018-08-31 13:25:01 +01:00
Modmuss50
cc8c2c6e3b
Fix odd name for Auto Crafting Table
2018-08-31 13:19:55 +01:00
drcrazy
cdaefe5886
Changed translation keys for block and items
2018-08-31 14:51:03 +03:00
Modmuss50
9b0f583cab
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin
2018-08-30 22:47:25 +01:00
drcrazy
2d3c074767
Fix for cells in CT scripts. Some work on #1590
2018-08-29 18:23:56 +03:00
drcrazy
c41b889160
Updated JEI compat to use VanillaTypes
2018-08-29 16:44:45 +03:00
drcrazy
f0852a09cf
Updated JEI createDrawable usage for fusion reactor.
2018-08-28 16:43:37 +03:00
drcrazy
f54353290b
Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437
2018-08-28 14:32:59 +03:00
EnGinners
304046b457
Update ru_ru.lang ( #1582 )
...
This one has less changes compare to similar one from @AlekseiVoronin
2018-08-28 13:40:47 +03:00
drcrazy
e254f519c6
Removed excessive not null check
2018-08-28 11:21:15 +03:00
Modmuss50
c1be3fb765
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428
2018-08-27 18:23:16 +01:00
drcrazy
f44aa92093
Removed unused imports
2018-08-27 17:52:26 +03:00
drcrazy
db4dbdc956
UU-matter is now part of parts enum
2018-08-27 15:48:41 +03:00
drcrazy
8f7cc291bd
OreDict partially back, same for some recipes
2018-08-27 15:28:26 +03:00
drcrazy
8987311694
Flattened parts
2018-08-27 13:26:56 +03:00
Modmuss50
f251349189
Should fix #1587
2018-08-24 21:07:38 +01:00
YuRaNnNzZZ
2e461b5ef6
rock cutter no longer gets enchanted on recraft
2018-08-24 20:12:50 +03:00
drcrazy
de45f3e68d
SmallDusts flattened
2018-08-24 15:56:53 +03:00
drcrazy
edd4e0df3e
Flattened dusts.
2018-08-24 14:56:25 +03:00
drcrazy
1ee9ffb007
Flattened ingots.
2018-08-24 13:43:03 +03:00
drcrazy
aadc7150f3
Gems are flattened
2018-08-23 17:16:17 +03:00
drcrazy
2939ee02a3
Flattened nuggets
2018-08-23 15:20:57 +03:00
drcrazy
45d6317d12
Changes plates registration
2018-08-23 14:05:22 +03:00
drcrazy
c86f3dc2f4
Changes after PR review
2018-08-23 13:36:56 +03:00