drcrazy
|
baacc67a64
|
Fixed unused and override warnings.
|
2018-06-12 12:55:57 +03:00 |
|
modmuss50
|
bc8cdbfeff
|
Test commit
|
2018-06-11 16:54:58 +01:00 |
|
modmuss50
|
4d4aea51a6
|
#releaseBuild
|
2018-06-10 12:00:08 +01: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
|
7ac0b83bc9
|
Merge pull request #1542 from DYColdWind/patch-4
Update zh_cn.lang
|
2018-06-10 10:56:33 +01:00 |
|
冷风
|
6fc0687d76
|
Update zh_cn.lang
|
2018-06-10 09:47:50 +08:00 |
|
modmuss50
|
00b40e99ad
|
#releaseBuild
|
2018-06-09 17:05:15 +01:00 |
|
modmuss50
|
475eb4b55f
|
Revert "Fixed warning in stack tooltip event."
This reverts commit 1614f71
|
2018-06-09 17:03:07 +01:00 |
|
modmuss50
|
c15f808686
|
#releaseBuild
|
2018-06-09 12:43:23 +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 |
|
Modmuss50
|
05bab2ec4c
|
Merge pull request #1537 from yaroslav4167/patch-2
Update ru_ru.lang
|
2018-06-08 23:35:47 +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
|
76735d93bd
|
Added contributing checklist.
|
2018-06-07 17:22:39 +03:00 |
|
drcrazy
|
23428d3223
|
Made transfer rate per connection
|
2018-06-07 03:09:03 +03:00 |
|
modmuss50
|
cc541bd55c
|
#releaseBuild
|
2018-06-05 22:12:58 +01:00 |
|
modmuss50
|
cbc302ff48
|
Decrease speed of by 3 ticks electrical furnace when using 4 overclockers
|
2018-06-05 21:57:04 +01:00 |
|
modmuss50
|
6cd98727a8
|
#releaseBuild
|
2018-06-02 17:06:23 +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
|
4d74c8d69b
|
#releaseBuild
|
2018-05-27 00:42:03 +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 |
|
