Commit graph

2898 commits

Author SHA1 Message Date
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
drcrazy
f45da44f2b Plates are flattened and enumed 2018-08-23 00:14:02 +03:00
drcrazy
be024f0179 Updated forge 2018-08-22 15:55:14 +03:00
Modmuss50
1d7ff39ccf
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-14 01:09:18 +01:00
Modmuss50
77ec6b6aaf
Hot fix for #1574 #releaseBuild 2018-08-14 01:08:50 +01:00
drcrazy
337a500a5c Coolant part also craftable from water cells 2018-08-13 15:35:30 +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
89beff99c7
Fluid config work 2018-08-11 15:23:57 +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
f7df41c379 Fix for typo in world config name. 2018-08-10 15:38:46 +03:00
drcrazy
d37f52a0ce Less chance for overworld TR loot and made in configurable. CLoses #1572 2018-08-10 15:33:59 +03:00
drcrazy
c3979610a9 Removed unused imports 2018-08-10 15:32:17 +03:00
drcrazy
fb957e9dac Allow oregen in non-vanilla dimensions. Closes #1571 2018-08-08 17:00:33 +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
7e49c30586
Add a transparent grey overlay over recipe output slot 2018-08-03 17:55:59 +01:00
modmuss50
e5d161cace
Write locked to nbt 2018-08-03 17:46:58 +01:00
modmuss50
bbef813fe5
thanks idea for importing the best imports, fixes build 2018-08-02 19:09:11 +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
16293571a2
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-07-30 19:42:28 +01: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
a75a493de7 Added blaze dust and HOP graphite dust recipes. 2018-07-30 13:07:50 +03:00
drcrazy
a6f242e7e6 Overriden setContainerToEmpty. I thought this was already in GH. 2018-07-30 11:48:39 +03:00
modmuss50
88e116d095
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-07-26 18:28:58 +01:00
modmuss50
8139b865a9
Fix potential issues 2018-07-26 18:16:59 +01:00
modmuss50
693cb6807a
Inital pass of cleaning up the networking, I will prob do some more in 1.13 2018-07-24 14:27:17 +01:00
modmuss50
69b9c511c3
Remove legacy tile support 2018-07-24 14:23:31 +01:00
modmuss50
1f65363396
Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep 2018-07-24 14:18:22 +01:00
modmuss50
1be2752b72
Rename fluids 2018-07-24 14:18:09 +01:00
drcrazy
a42e04606f Done with maxCharge and trasnferRate review for powered items 2018-07-23 14:21:07 +03:00
drcrazy
eb2816df1d Returned return. 2018-07-23 13:47:12 +03:00
drcrazy
b3002b6f57 Fixed warnings 2018-07-23 12:55:18 +03:00
modmuss50
095390b430
Fix cell model 2018-07-20 22:39:09 +01:00
modmuss50
2910acc29c
Remove META_PLACEHOLDER 2018-07-20 22:36:38 +01:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
389b716880
Fix build 2018-07-20 22:10:29 +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
7b630f576f Polishing powered items 2018-07-20 17:23:21 +03:00
drcrazy
daf4b6fad6 Capacity changes for powered armor 2018-07-20 12:58:52 +03:00
drcrazy
b3590dbb37 Make it run but tons of useless copy-paste 2018-07-20 02:56:19 +03:00
drcrazy
523d0284b7 Updated powered items to match RC changes 2018-07-19 18:30:47 +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
2b74ea1ebe Removed excessive finals. 2018-07-16 18:19:31 +03:00
drcrazy
5ce0397575 Changed Blocks.AIR to Material.AIR in multiblock checks. 2018-07-16 15:46:39 +03:00
drcrazy
60873481f3 Unused anymore. 2018-07-13 18:04:50 +03:00
drcrazy
c35d85fe10 More loot tables. 2018-07-12 17:41:14 +03:00
drcrazy
760dea8f94 Moved Event Bus registration to compat module. 2018-07-10 02:24:05 +03:00
drcrazy
2b32e6ecf1 Moved IC2 compat recipes from postInit to event. Closes #1565 2018-07-10 02:13:48 +03:00
drcrazy
1777343e96 Added TR loot to basic Overworld chests. 2018-07-09 17:06:15 +03:00
YuRaNnNzZZ
ced370444f adv/diamond electric tools charge rate buff (#1558) (Kudos to YuRaNnNzZZ) 2018-06-26 11:53:21 +03:00
drcrazy
ff9ceecc28 Removed unused imports ) 2018-06-25 14:55:23 +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
96d78c11a8 Shift for more info on powerbar. Closes FTBTeam/FTB-Continuum#261 2018-06-25 12:26:07 +03:00
modmuss50
7124ee6a11
Remove range upgrade as it didnt do anything 2018-06-24 10:48:47 +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
d6b9656b7c Fix for Assembly Machine JEI GUI progress. Closes #1555 2018-06-23 19:30:33 +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
Eric Chai
ca9a2c9b38 Corrected the ADVANCED_JACKHAMMER recipe (#1553) 2018-06-20 11:45:47 +03:00
drcrazy
48d2227407 Made batteries charge configurable for non-basic batteries. 2018-06-19 14:01:10 +03:00
ProfessorProspector
1ebf67d933 Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does 2018-06-16 10:27:19 -07:00
ProfessorProspector
a32c40a68a Merge remote-tracking branch 'origin/1.12' into 1.12 2018-06-16 10:05:16 -07:00
ProfessorProspector
77ed9f7bba Remove accidental refined diamond 2018-06-16 10:03:20 -07:00
modmuss50
0e857e8b70
Fix #1546 2018-06-16 16:37:17 +01: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
ProfessorProspector
603e346c0f New ore textures 2018-06-14 19:17:53 -07:00
ProfessorProspector
9ed05fb7ff Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/BlockAlarm.java
2018-06-14 10:57:07 -07:00
ProfessorProspector
cfda5fd2a4 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
#	src/main/java/techreborn/blocks/generator/BlockWaterMill.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
2018-06-14 10:53:32 -07: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
drcrazy
e2225b06d4 Updated wrenching logic. Some work for #1543 2018-06-13 15:28:31 +03:00
Prospector
6d3b415ddd Unify creative tabs 2018-06-12 15:42:20 -07:00
drcrazy
baacc67a64 Fixed unused and override warnings. 2018-06-12 12:55:57 +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
dace0e56d0
Show required stacks when building fusion reactor 2018-06-10 11:36:21 +01:00
modmuss50
475eb4b55f
Revert "Fixed warning in stack tooltip event."
This reverts commit 1614f71
2018-06-09 17:03:07 +01:00
modmuss50
d9b8f274e0
Add rubber tree biome blacklist, closes #1529 2018-06-09 12:39:55 +01:00
modmuss50
354a80572c
Tweak power output of fusion reactor, closes #1521 2018-06-09 12:26:11 +01:00
modmuss50
0536ef08a0
Fix some final issues with the slabs + add recipes 2018-06-09 11:32:02 +01:00