Commit graph

835 commits

Author SHA1 Message Date
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
a40635e75f Renamed ModItems to TRItems. Sorted members inside it. 2018-09-03 17:46:21 +03:00
drcrazy
33b9f697dc Merged all ingredients into single class 2018-09-03 14:49:59 +03:00
drcrazy
e254f519c6 Removed excessive not null check 2018-08-28 11:21:15 +03:00
drcrazy
db4dbdc956 UU-matter is now part of parts enum 2018-08-27 15:48:41 +03:00
drcrazy
8987311694 Flattened parts 2018-08-27 13:26:56 +03:00
Modmuss50
35f82eb5d3
Update licenses 2018-08-12 16:36:16 +01:00
Modmuss50
4e352c0953
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid 2018-08-12 16:32:43 +01:00
Modmuss50
84aeeb978c
Fix most modded fluids not working in our machines 2018-08-11 20:08:44 +01:00
Modmuss50
808a07fdbf
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-10 17:46:10 +01:00
Modmuss50
39475f86dc
Initial fluid config work 2018-08-10 17:45:16 +01:00
drcrazy
c3979610a9 Removed unused imports 2018-08-10 15:32:17 +03:00
drcrazy
2e4c3ebf1a Some flattening attempt for plates 2018-08-07 13:50:46 +03:00
modmuss50
53b450acea
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
2018-08-03 18:04:40 +01:00
modmuss50
e5d161cace
Write locked to nbt 2018-08-03 17:46:58 +01:00
modmuss50
b8ad3175fd
Add JEI support for recipes in auto crafting table 2018-08-02 19:07:56 +01:00
modmuss50
e1d1ab8c08
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-02 18:43:25 +01:00
modmuss50
ffb770f64f
Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example. 2018-08-02 18:42:58 +01:00
drcrazy
d03b0edbd7 Max energy for matter fabricator is 10M EU \ 40M FE 2018-08-02 18:06:43 +03:00
modmuss50
3d9b81a6b0
Fix possible dupe bug, and allow better support for larger item stack sizes 2018-07-30 19:42:08 +01:00
drcrazy
b3002b6f57 Fixed warnings 2018-07-23 12:55:18 +03:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
7f8ce535a7
General code cleanup 2018-07-20 22:08:21 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC 2018-07-20 22:02:46 +01:00
modmuss50
f78abb1a21
Remove some old stuff 2018-07-20 21:55:29 +01:00
drcrazy
b3590dbb37 Make it run but tons of useless copy-paste 2018-07-20 02:56:19 +03:00
modmuss50
b65e963f12
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +01:00
drcrazy
5ce0397575 Changed Blocks.AIR to Material.AIR in multiblock checks. 2018-07-16 15:46:39 +03:00
modmuss50
d4a43d24a1
Fix incorrect usage of item stack checking
I have no idea how they worked without issue for this long :D
2018-06-25 12:34:13 +01:00
drcrazy
00a317074d Speed up items charge. 2018-06-24 12:20:06 +03:00
drcrazy
af6cb38bfb Fix crash with non-TR items charge. 2018-06-24 12:14:12 +03:00
drcrazy
452932c04e More formatting changes. 2018-06-23 19:00:44 +03:00
Eric Chai
52ff6699b4 Fusion reactor consumes resources. Fixes #1551 (#1556)
Since resources are consumed during start up, they should also
be consumed when resetting the crafting cycle.
2018-06-23 18:40:56 +03:00
drcrazy
1de3fe5dc5 Lot of formatting. 2018-06-22 18:22:16 +03:00
drcrazy
d584aebcd8 Fixed water mill animation. 2018-06-22 13:35:26 +03:00
drcrazy
30302e241b Fixed charging \ discharging items items. Closes #1547 2018-06-20 18:27:58 +03:00
drcrazy
7be239adca Updated wrenching logic for energy storages and casings. Closes #1543 2018-06-15 18:18:32 +03:00
drcrazy
24bce3ce66 Updated wrenching for lamp and alarm 2018-06-15 17:26:43 +03:00
drcrazy
8d1c116df0 Updated wrench logic for cables. 2018-06-15 16:49:46 +03:00
drcrazy
c409b67c3c Updated block wrenching 2018-06-14 18:32:41 +03:00
drcrazy
77e1c54b86 Fixed inventory drop for DSU. More work on #1543 2018-06-14 18:32:40 +03:00
drcrazy
42bc110cb2 Fixed build, but DSU blocks are not done yet. 2018-06-13 17:42:46 +03:00
modmuss50
7db0097d23
Fusion reactor uses inputs before the craft starts to prevent power exploit, closes #1539 2018-06-10 11:53:03 +01:00
modmuss50
c201b3dbcf
Make fusion reactor recipe shapeless, so it can work either way around 2018-06-10 11:47:51 +01:00
modmuss50
32ea97b29e
Fix #1541 2018-06-10 11:41:45 +01:00
modmuss50
354a80572c
Tweak power output of fusion reactor, closes #1521 2018-06-09 12:26:11 +01:00
modmuss50
914aa3423b
Fixes #1533 2018-06-08 18:39:16 +01:00
drcrazy
23428d3223 Made transfer rate per connection 2018-06-07 03:09:03 +03:00
modmuss50
cbc302ff48
Decrease speed of by 3 ticks electrical furnace when using 4 overclockers 2018-06-05 21:57:04 +01:00
drcrazy
74107dd3ea Made cable not able to receive energy if full. Same for provide/empty 2018-06-01 14:03:45 +03:00