Commit graph

3768 commits

Author SHA1 Message Date
Modmuss50
7ed304329a
Log more when building #releaseBuild 2018-09-01 23:46:05 +01:00
Modmuss50
96c36e272f
#releaseBuild 2018-09-01 23:32:26 +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
Modmuss50
cee083eb88
Fix crowdinExport task 2018-08-31 16:00:31 +01:00
Modmuss50
d4e08ba976
Trigger a crowdin export before downloading the translations 2018-08-31 15:29:59 +01:00
drcrazy
edf0227598 CLeanup of blocks 2018-08-31 15:36:39 +03:00
Modmuss50
1b0ff5f95a
Fix small naming issue 2018-08-31 13:25:01 +01:00
Modmuss50
cc8c2c6e3b
Fix odd name for Auto Crafting Table 2018-08-31 13:19:55 +01:00
drcrazy
cdaefe5886 Changed translation keys for block and items 2018-08-31 14:51:03 +03:00
Modmuss50
9b0f583cab
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin 2018-08-30 22:47:25 +01: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
EnGinners
304046b457 Update ru_ru.lang (#1582)
This one has less changes compare to similar one from @AlekseiVoronin
2018-08-28 13:40:47 +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
Modmuss50
0ea442a993
Merge pull request #1588 from YuRaNnNzZZ/1.12-rockcutterfix
Fix for Rock Cutter getting an enchant on every re-craft
2018-08-24 18:16:56 +01:00
YuRaNnNzZZ
2e461b5ef6
rock cutter no longer gets enchanted on recraft 2018-08-24 20:12:50 +03:00
Modmuss50
5d17985960
#releaseBuild 2018-08-14 01:10:55 +01: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
8eed83b0f8
Merge pull request #1573 from DYColdWind/patch-5
Update zh_cn.lang
2018-08-13 10:01:17 +01:00
冷风
3681e0b1e3
Update zh_cn.lang 2018-08-13 08:58:10 +08:00
Modmuss50
f2c5d71fb7
#releaseBuild 2018-08-12 16:51:13 +01: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
modmuss50
062114f3a9
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-08 15:15:53 +01:00
modmuss50
7270adbec4
Revert: [ImgBot] optimizes images - Fixes textures having a solid background 2018-08-08 15:15:26 +01:00
drcrazy
fb957e9dac Allow oregen in non-vanilla dimensions. Closes #1571 2018-08-08 17:00:33 +03:00
modmuss50
1cd5e06757
#releaseBuild 2018-08-03 17:58:12 +01:00
modmuss50
7e49c30586
Add a transparent grey overlay over recipe output slot 2018-08-03 17:55:59 +01:00
modmuss50
ee65ed0cbe
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-03 17:47:26 +01:00
modmuss50
e5d161cace
Write locked to nbt 2018-08-03 17:46:58 +01:00
Modmuss50
94fa8d1b62
Merge pull request #1569 from TechReborn/imgbot
[ImgBot] optimizes images
2018-08-03 00:40:16 +01:00
modmuss50
c461dd8cf5
#releaseBuild 2018-08-02 19:18:01 +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