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 |
|
ProfessorProspector
|
415660c988
|
Tweak how nugget recipes are done once again, and \o/ 2500th commit!
|
2016-12-22 15:12:13 -08:00 |
|
ProfessorProspector
|
2e9bf11569
|
Fix nuggets -> ingot recipes
|
2016-12-22 14:40:24 -08:00 |
|
ProfessorProspector
|
68d5a49d75
|
Add iridium reinforced stone & tungstensteel block recipes
|
2016-12-22 14:39:10 -08:00 |
|
ProfessorProspector
|
a446c76397
|
Add nuggets -> ingot and ingot -> nuggets recipes
|
2016-12-22 14:33:21 -08:00 |
|
ProfessorProspector
|
73f362bf76
|
Actually fix gems ore dict
|
2016-12-21 17:08:13 -08:00 |
|
ProfessorProspector
|
948d4de3ad
|
Fix block ore dictionary names
|
2016-12-21 16:41:33 -08:00 |
|
ProfessorProspector
|
1759199601
|
Remove debug code
|
2016-12-21 16:22:34 -08:00 |
|
ProfessorProspector
|
011f164bd7
|
Fix gem ore dictionary entries
|
2016-12-21 16:20:34 -08:00 |
|
ProfessorProspector
|
78a3d1f589
|
Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild
|
2016-12-21 15:59:27 -08: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
|
10ef977fd9
|
Fix ore dic names, closes #853
|
2016-12-20 14:08:15 +00:00 |
|
modmuss50
|
3e6fc0647f
|
Fix crash with certain mods, closes #854
|
2016-12-20 14:02:21 +00:00 |
|
modmuss50
|
bfcc3a2117
|
Initial work on IC2 de-duplication
|
2016-12-18 21:36:29 +00:00 |
|
Ourten
|
97192ee3f4
|
Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
They should all be pretty now
|
2016-12-17 01:25:32 +01:00 |
|
modmuss50
|
57720c61de
|
Fix Iridum Recipe, fixes #792
|
2016-12-14 10:10:07 +00:00 |
|
modmuss50
|
ee96908775
|
Disable recipe, to fix crash with a certain set of mods. #releaseBuild
|
2016-12-13 19:19:12 +00:00 |
|
modmuss50
|
601194685b
|
Merge 1.10 changes, bump version for #releaseBuild
|
2016-12-13 11:53:33 +00:00 |
|
modmuss50
|
a3b4e9de6e
|
Merge 1.10, bump version for #releaseBuild
|
2016-12-13 11:51:33 +00:00 |
|
ProfessorProspector
|
c271422e11
|
Remove deprecated empty cell
|
2016-12-12 15:57:04 -08:00 |
|
modmuss50
|
0d7e26e74a
|
Remove log, and add small dusts to ore dict
|
2016-12-12 17:54:20 +00:00 |
|
modmuss50
|
29f40e1f98
|
Add plate recipes based of ore dic
|
2016-12-12 15:53:04 +00:00 |
|
modmuss50
|
27862b0a28
|
Add some more recipes listed in #818
|
2016-12-12 15:29:25 +00:00 |
|
modmuss50
|
59b7610227
|
Fix extractor recipe allowing any wood for sap extraction, close #381 again
|
2016-12-12 09:22:19 +00:00 |
|
ProfessorProspector
|
49f227ca81
|
MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model
|
2016-12-11 17:27:39 -08:00 |
|
ProfessorProspector
|
8012abee3b
|
Move dusts and smalldusts to json
|
2016-12-11 11:34:56 -08:00 |
|
ProfessorProspector
|
3da6083c68
|
Nuggets now use jsons, and nuggets now return proper subtypes
|
2016-12-11 10:58:20 -08:00 |
|
ProfessorProspector
|
5186f3d0ae
|
#releaseBuild
|
2016-12-10 15:04:24 -08:00 |
|
ProfessorProspector
|
9e3372c5aa
|
remove debug line
|
2016-12-10 15:00:53 -08:00 |
|
ProfessorProspector
|
d510b24599
|
Fix improper plate ore dictionary entries
|
2016-12-10 15:00:20 -08:00 |
|
ProfessorProspector
|
7e0b84360c
|
Fix ore dict recipes
|
2016-12-10 14:27:37 -08:00 |
|
ProfessorProspector
|
2911e7f0ca
|
Move ingots, plates, and gems to jsons
|
2016-12-10 00:15:39 -08:00 |
|
ProfessorProspector
|
226c0bc619
|
Improve energy bars on items
|
2016-12-08 18:39:49 -08:00 |
|
modmuss50
|
3f8128d890
|
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/items/tools/ItemWrench.java
|
2016-12-07 13:52:48 +00:00 |
|
modmuss50
|
695ca83896
|
Fix drill recipes, closes #819
|
2016-12-07 13:27:20 +00:00 |
|
modmuss50
|
a42cf2990f
|
Fix recipes, without silicon
|
2016-12-05 13:04:21 +00:00 |
|
modmuss50
|
463740ac99
|
Rename method to reflect the 1.11 changes.
|
2016-12-05 11:19:37 +00:00 |
|
modmuss50
|
d53f4dafc1
|
Added extra validation to recipe inputs and outputs, fixed one bug because of it.
|
2016-12-05 11:18:30 +00:00 |
|
modmuss50
|
72f85d5243
|
Auto format code.
|
2016-12-05 10:48:21 +00:00 |
|
modmuss50
|
a96c094267
|
Removed un used block.
|
2016-12-05 10:21:17 +00:00 |
|
modmuss50
|
8379115c97
|
Fix Machine Casings
|
2016-12-05 10:17:39 +00:00 |
|
modmuss50
|
c661f6b278
|
Fix Machine Casing Model
|
2016-12-05 10:07:41 +00:00 |
|
modmuss50
|
2fdce5405b
|
Improve block names
|
2016-12-05 09:40:55 +00:00 |
|
modmuss50
|
1dbc56f739
|
Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup).
|
2016-11-28 13:01:30 +00:00 |
|
modmuss50
|
83ef3e7577
|
Start of new texturesm, again
|
2016-11-28 12:54:44 +00:00 |
|
modmuss50
|
e16c3eba02
|
Auto format
|
2016-11-25 13:25:51 +00:00 |
|
modmuss50
|
528fecc2b5
|
Fix a load of null issues, and get it to sort of work.
|
2016-11-19 16:36:13 +00:00 |
|
modmuss50
|
65e651f402
|
It compiles, disable JEI as it needs redoing
|
2016-11-19 14:41:00 +00:00 |
|