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 |
|
drcrazy
|
db4dbdc956
|
UU-matter is now part of parts enum
|
2018-08-27 15:48:41 +03:00 |
|
drcrazy
|
8f7cc291bd
|
OreDict partially back, same for some recipes
|
2018-08-27 15:28:26 +03:00 |
|
drcrazy
|
8987311694
|
Flattened parts
|
2018-08-27 13:26:56 +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 |
|
drcrazy
|
de45f3e68d
|
SmallDusts flattened
|
2018-08-24 15:56:53 +03:00 |
|
drcrazy
|
edd4e0df3e
|
Flattened dusts.
|
2018-08-24 14:56:25 +03:00 |
|
drcrazy
|
1ee9ffb007
|
Flattened ingots.
|
2018-08-24 13:43:03 +03:00 |
|
drcrazy
|
aadc7150f3
|
Gems are flattened
|
2018-08-23 17:16:17 +03:00 |
|
drcrazy
|
2939ee02a3
|
Flattened nuggets
|
2018-08-23 15:20:57 +03:00 |
|
drcrazy
|
45d6317d12
|
Changes plates registration
|
2018-08-23 14:05:22 +03:00 |
|
drcrazy
|
c86f3dc2f4
|
Changes after PR review
|
2018-08-23 13:36:56 +03:00 |
|
drcrazy
|
f45da44f2b
|
Plates are flattened and enumed
|
2018-08-23 00:14:02 +03:00 |
|
drcrazy
|
be024f0179
|
Updated forge
|
2018-08-22 15:55:14 +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 |
|
drcrazy
|
2e4c3ebf1a
|
Some flattening attempt for plates
|
2018-08-07 13:50:46 +03:00 |
|
modmuss50
|
53b450acea
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
|
2018-08-03 18:04:40 +01: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 |
|
