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 |
|
drcrazy
|
525e85dd4a
|
#releaseBuild
|
2018-06-27 17:03:16 +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
|
ec13f82628
|
Updated OC version.
|
2018-06-22 15:40:32 +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 |
|
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 |
|
