Commit graph

22 commits

Author SHA1 Message Date
drcrazy
6d3d1f2df2 Organized items. MOved creative tab setter to parent. 2018-09-07 14:51:41 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
drcrazy
b2d2be24c6 Updated recipies and fixed build 2017-11-30 16:46:11 +03:00
modmuss50
46f011ef69 Remove upgrades from the dedupe list, fixes #1302 2017-10-12 21:55:41 +01:00
drcrazy
8588a40474 Added plateIridiumAlloy. Closes #1262. Closes #1073 2017-09-06 02:38:07 +03:00
drcrazy
71a0ac3e66 Updated recipe to use or not use oreDict names. Closes #1210 2017-09-05 23:40:40 +03:00
drcrazy
f465c6cf47 Refactored Crafting Table recipies; Fixed IDE warnings for unused (#1241)
imports; Update CoFH deps to fix build
2017-08-21 14:25:13 -07:00
modmuss50
2529f3fd9a
Try and prevent invalid ore dict names being registered 2017-07-01 19:27:07 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support 2017-04-21 09:09:28 +01:00
modmuss50
8b80cb7562
De-Dupe Frequency Transmitter
(cherry picked from commit 127df1f)
2017-03-13 11:04:25 +00:00
modmuss50
bbf93c3ae3
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
Closes #1002 and Closes #822

(cherry picked from commit 93ccd8b)
2017-03-13 11:03:44 +00:00
modmuss50
76332ee946
Fixes some recipes not using the ore dict correctly.
(cherry picked from commit 3ee81c2)
2017-03-13 11:02:56 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
modmuss50
7a6b3b6b48
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild 2016-12-21 17:57:36 +00:00
modmuss50
936ee13686
Remove last duplicated items. 2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks 2016-12-21 17:31:52 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
modmuss50
796df6c055
Auto Format code 2016-10-08 20:46:16 +01:00
modmuss50
adf9b8c0e4 Fix #676 2016-07-16 22:16:22 +01:00