Commit graph

1024 commits

Author SHA1 Message Date
drcrazy
0b1733b733 DUsts and dustsSmall are combined into single class 2018-09-03 14:00:06 +03:00
drcrazy
f01d75404c Buffed oreCoal processing in Industrial Grinder 2018-09-02 23:45:02 +03:00
drcrazy
3190185a54 Cleaned fluid translation keys. 2018-09-01 02:46:25 +03:00
drcrazy
cdaefe5886 Changed translation keys for block and items 2018-08-31 14:51:03 +03: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
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
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
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
drcrazy
d37f52a0ce Less chance for overworld TR loot and made in configurable. CLoses #1572 2018-08-10 15:33:59 +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
drcrazy
a75a493de7 Added blaze dust and HOP graphite dust recipes. 2018-07-30 13:07:50 +03:00
modmuss50
69b9c511c3
Remove legacy tile support 2018-07-24 14:23:31 +01:00
modmuss50
1be2752b72
Rename fluids 2018-07-24 14:18:09 +01:00
drcrazy
b3002b6f57 Fixed warnings 2018-07-23 12:55:18 +03:00
modmuss50
2910acc29c
Remove META_PLACEHOLDER 2018-07-20 22:36:38 +01:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
7f8ce535a7
General code cleanup 2018-07-20 22:08:21 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC 2018-07-20 22:02:46 +01:00
drcrazy
7b630f576f Polishing powered items 2018-07-20 17:23:21 +03:00
drcrazy
b3590dbb37 Make it run but tons of useless copy-paste 2018-07-20 02:56:19 +03:00
modmuss50
b65e963f12
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +01:00
drcrazy
c35d85fe10 More loot tables. 2018-07-12 17:41:14 +03:00
drcrazy
1777343e96 Added TR loot to basic Overworld chests. 2018-07-09 17:06:15 +03:00
Eric Chai
ca9a2c9b38 Corrected the ADVANCED_JACKHAMMER recipe (#1553) 2018-06-20 11:45:47 +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
modmuss50
0536ef08a0
Fix some final issues with the slabs + add recipes 2018-06-09 11:32:02 +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
60c8527f6d
Rubber plank stairs and slab 2018-06-08 21:05:56 +01:00
modmuss50
548d393820
Allow repairing gem tools and armor in anvil 2018-06-08 18:33:26 +01:00
drcrazy
e834ba390d Updated industrial electrolyzer crafting recipe. 2018-06-01 14:18:06 +03:00
drcrazy
3930b150a0 Fixed warning with TE registration 2018-05-30 16:57:23 +03:00
drcrazy
f59a4775a9 Fixed license and updated Thermal and Forge deps 2018-05-30 15:00:54 +03:00
modmuss50
874b08e919
only check tiles on the minecraft resource domain, should be a bit quicker 2018-05-27 10:58:20 +01:00
modmuss50
6bc73adc35
Rewrite tile registry + rename all tiles. Worlds should upgrade fine using datafixers 2018-05-27 10:53:26 +01:00
drcrazy
f203bbbefd Started work on capability for powered item 2018-05-23 00:27:35 +03:00
modmuss50
66bb38543e
Fix #1517 2018-05-20 15:43:46 +01:00