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 |
|
Prospector
|
b1682ef791
|
Update README.md
|
2018-06-13 18:35:42 -07: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 |
|
Prospector
|
ac9c01555f
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12-v2.16
|
2018-06-12 15:13:23 -07:00 |
|
Prospector
|
7e794894a3
|
Add a gradle task to output libs
|
2018-06-12 15:13:17 -07:00 |
|
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 |
|
