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 |
|
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 |
|
modmuss50
|
e1d1ab8c08
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-08-02 18:43:25 +01:00 |
|
modmuss50
|
ffb770f64f
|
Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example.
|
2018-08-02 18:42:58 +01:00 |
|
drcrazy
|
d03b0edbd7
|
Max energy for matter fabricator is 10M EU \ 40M FE
|
2018-08-02 18:06:43 +03:00 |
|
modmuss50
|
16293571a2
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-07-30 19:42:28 +01:00 |
|
modmuss50
|
3d9b81a6b0
|
Fix possible dupe bug, and allow better support for larger item stack sizes
|
2018-07-30 19:42:08 +01:00 |
|
drcrazy
|
a75a493de7
|
Added blaze dust and HOP graphite dust recipes.
|
2018-07-30 13:07:50 +03:00 |
|
drcrazy
|
a6f242e7e6
|
Overriden setContainerToEmpty. I thought this was already in GH.
|
2018-07-30 11:48:39 +03:00 |
|
ImgBotApp
|
2a0d737c92
|
[ImgBot] optimizes images
/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png -- 0.44kb -> 0.43kb (3.1%)
|
2018-07-28 18:42:24 +00:00 |
|
Modmuss50
|
c0b7c16dfd
|
Merge pull request #1568 from TechReborn/imgbot
[ImgBot] optimizes images
|
2018-07-28 19:40:53 +01:00 |
|
