drcrazy
|
c56da8cf18
|
Use static fuse in static way. cherry-pick from: 8cac9a9315
|
2018-09-07 12:21:34 +01: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
|
cdaefe5886
|
Changed translation keys for block and items
|
2018-08-31 14:51:03 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
modmuss50
|
1e129640fe
|
Copy itemstacks before checking them for valid wood recipes, should fix #1538
|
2018-06-09 11:19:16 +01:00 |
|
modmuss50
|
60c8527f6d
|
Rubber plank stairs and slab
|
2018-06-08 21:05:56 +01:00 |
|
modmuss50
|
169fa646fb
|
Add slot config to iron furnace, fixes #1536
|
2018-06-08 18:46:50 +01:00 |
|
modmuss50
|
914aa3423b
|
Fixes #1533
|
2018-06-08 18:39:16 +01:00 |
|
modmuss50
|
548d393820
|
Allow repairing gem tools and armor in anvil
|
2018-06-08 18:33:26 +01:00 |
|
drcrazy
|
93e324cc11
|
Fixed electric tree tap. Closes #1535
|
2018-06-08 15:46:28 +03: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
|
e834ba390d
|
Updated industrial electrolyzer crafting recipe.
|
2018-06-01 14:18:06 +03:00 |
|
drcrazy
|
74107dd3ea
|
Made cable not able to receive energy if full. Same for provide/empty
|
2018-06-01 14:03:45 +03:00 |
|
drcrazy
|
5e960ec3f2
|
Updated JEI support for rolling machine.
|
2018-05-31 20:36:53 +03:00 |
|
drcrazy
|
2574a898d8
|
Bumped requred forge version
|
2018-05-30 17:14:00 +03:00 |
|