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 |
|
冷风
|
6fc0687d76
|
Update zh_cn.lang
|
2018-06-10 09:47:50 +08: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
|
a567139ffd
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-06-09 11:19:31 +01:00 |
|
modmuss50
|
1e129640fe
|
Copy itemstacks before checking them for valid wood recipes, should fix #1538
|
2018-06-09 11:19:16 +01:00 |
|
Yaroslavik
|
821d4081a3
|
Update ru_ru.lang
Translate rubber plank stairs and slab
|
2018-06-09 00:33:44 +02: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 |
|
drcrazy
|
2fb4c4559e
|
Removed unused variable
|
2018-05-30 17:01:56 +03:00 |
|
drcrazy
|
3930b150a0
|
Fixed warning with TE registration
|
2018-05-30 16:57:23 +03:00 |
|
drcrazy
|
f59a4775a9
|
Fixed license and updated Thermal and Forge deps
|
2018-05-30 15:00:54 +03:00 |
|
drcrazy
|
362a93af3d
|
Fixed BC fuel energy gen. Closes #1524
|
2018-05-29 13:50:06 +03:00 |
|
modmuss50
|
874b08e919
|
only check tiles on the minecraft resource domain, should be a bit quicker
|
2018-05-27 10:58:20 +01:00 |
|
modmuss50
|
6bc73adc35
|
Rewrite tile registry + rename all tiles. Worlds should upgrade fine using datafixers
|
2018-05-27 10:53:26 +01:00 |
|
modmuss50
|
959e318859
|
Add energy storage to RebornCore's wrenableBlocks list
|
2018-05-26 20:38:47 +01:00 |
|
drcrazy
|
24c41f356f
|
Bumped up lighting rod
|
2018-05-26 02:55:01 +03:00 |
|
drcrazy
|
1614f71244
|
Fixed warning in stack tooltip event.
|
2018-05-25 17:51:52 +03:00 |
|
drcrazy
|
1ad23439eb
|
Cleaned up supressed warnings
|
2018-05-25 14:24:35 +03:00 |
|
drcrazy
|
6d242b08d5
|
Nano Saber energy storage is now configurable.
|
2018-05-25 12:12:59 +03:00 |
|
drcrazy
|
e7644b6b68
|
Updated storage values for powered items
|
2018-05-25 11:50:32 +03:00 |
|
modmuss50
|
7ab300a810
|
Make Craft Tweaker removeInputRecipe less strict, https://github.com/FTBTeam/FTB-Continuum/issues/58
Hopefully this doesnt break scripts, let me know if it does ;)
|
2018-05-24 11:36:43 +01:00 |
|
modmuss50
|
1c6e26dd99
|
Fix minor mistake
|
2018-05-23 15:06:29 +01:00 |
|
modmuss50
|
02c708cd21
|
Final changes to the item power storage
|
2018-05-23 14:49:14 +01:00 |
|
modmuss50
|
682670ca51
|
Item charging + discharging is now done using the caps
|
2018-05-23 14:07:37 +01:00 |
|
drcrazy
|
250a25d25f
|
Fixed durability bar
|
2018-05-23 01:33:07 +03:00 |
|
drcrazy
|
ff18e28d1c
|
Remaining changes for powered items.
|
2018-05-23 00:36:11 +03:00 |
|
drcrazy
|
f203bbbefd
|
Started work on capability for powered item
|
2018-05-23 00:27:35 +03:00 |
|
drcrazy
|
c4c5f2135c
|
Started work in switching powered items to capability
|
2018-05-23 00:27:33 +03:00 |
|
modmuss50
|
eb4ba94593
|
Fix https://github.com/FTBTeam/FTB-Continuum/issues/52
|
2018-05-20 21:41:58 +01:00 |
|
modmuss50
|
d2f6f89838
|
Load recipes a bit earlier to fix some issues with crafttweaker, hopefully this doesnt break anything thing else. Fixes #1520
|
2018-05-20 16:01:58 +01:00 |
|
modmuss50
|
66bb38543e
|
Fix #1517
|
2018-05-20 15:43:46 +01:00 |
|
modmuss50
|
8ef39d18e8
|
Reduce the time on some recipes
|
2018-05-18 11:27:49 +01:00 |
|
drcrazy
|
85b736065c
|
Fixed charge of TR items.
|
2018-05-18 12:34:58 +03:00 |
|
modmuss50
|
4c73363206
|
Fixes #1513
|
2018-05-17 11:12:21 +01:00 |
|
modmuss50
|
c20e1c72a9
|
Fixes #1515
|
2018-05-17 11:00:35 +01:00 |
|
modmuss50
|
fc2c4cce0c
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-05-17 10:59:00 +01:00 |
|
modmuss50
|
ffa9e7b5eb
|
Fix #1516
|
2018-05-17 10:58:53 +01:00 |
|
drcrazy
|
c10c06260b
|
Fixed excessive energy usage to charge RF items
|
2018-05-17 03:43:58 +03:00 |
|
drcrazy
|
29b886ea8d
|
Fixed unchecked warning
|
2018-05-17 03:41:19 +03:00 |
|
modmuss50
|
49a06b6044
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-05-16 17:27:52 +01:00 |
|
modmuss50
|
72c8c6252a
|
Add a config to disable sawmill recipes
|
2018-05-16 17:27:44 +01:00 |
|
drcrazy
|
134198c948
|
Updated i18n usage.
|
2018-05-14 12:24:44 +03:00 |
|
drcrazy
|
185d84c904
|
Added JEI support for assembly machine. Closes #1512
|
2018-05-10 18:32:11 +03:00 |
|
drcrazy
|
ed9cdc7353
|
GUI update for assembly machine. Some work for #1512
|
2018-05-08 18:05:49 +03:00 |
|
drcrazy
|
7bc792fd69
|
Fixed license. )
|
2018-05-08 17:08:41 +03:00 |
|
modmuss50
|
2b216ee183
|
Register recipes later, mainly just a test
|
2018-05-08 13:35:25 +01:00 |
|
modmuss50
|
3d4432a877
|
Add grinder and extractor recipes for ic2 tin cans, closes #1508
|
2018-05-06 12:38:40 +01:00 |
|
modmuss50
|
22f0b74f76
|
Remove rolling machine recipe transfer as it was broken
|
2018-05-06 12:15:09 +01:00 |
|
modmuss50
|
36e934ae6a
|
Fix typo in OC driver
|
2018-05-06 12:10:55 +01:00 |
|
modmuss50
|
c6d8a8abcb
|
Industrial Grinder now makes Coal instead of Pulverized Coal, Closes #1511
|
2018-05-06 12:09:45 +01:00 |
|
modmuss50
|
4c192ec1e8
|
Add Immersive Engineering Creosote to semi-fluid generator
|
2018-05-06 12:01:15 +01:00 |
|
modmuss50
|
1c10c199ae
|
Fixes some issues with the storage chests, closes #1481
|
2018-05-04 12:06:40 +01:00 |
|
