diff --git a/build/main.py b/build/main.py index a2f695e5d..e3db8ba0c 100644 --- a/build/main.py +++ b/build/main.py @@ -47,7 +47,7 @@ def build(args): modlist = [] basePath = os.path.normpath(os.path.realpath(__file__)[:-7] + "..") copyDirs = ["/scripts", "/resources", "/config", - "/mods", "/structures", "/groovy", "/simple-rpc", "/resourcepacks"] + "/structures", "/groovy", "/simple-rpc", "/resourcepacks"] serverCopyDirs = ["/scripts", "/config", "/mods", "/structures", "/groovy", "/resourcepacks"] diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index 91801d782..589f04e6e 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -3375,6 +3375,7 @@ "ismain:1": 1, "name:8": "susy.quest.db.78.title", "questlogic:8": "OR", + "tasklogic:8": "OR", "visibility:8": "ALWAYS" } }, @@ -7148,73 +7149,6 @@ } }, "176:10": { - "preRequisites:11": [ - 31 - ], - "properties:10": { - "betterquesting:10": { - "desc:8": "susy.quest.db.176.desc", - "icon:10": { - "Damage:2": 1024, - "id:8": "gregtech:machine" - }, - "ignoresview:1": 0, - "name:8": "susy.quest.db.176.title", - "visibility:8": "ALWAYS" - } - }, - "questID:3": 176, - "rewards:9": { - "0:10": { - "rewardID:8": "bq_standard:item", - "rewards:9": { - "0:10": { - "Count:3": 4, - "Damage:2": 60, - "id:8": "gregtechfoodoption:gtfo_meta_item" - } - } - } - }, - "tasks:9": { - "0:10": { - "entryLogic:8": "AND", - "partialMatch:1": 1, - "requiredItems:9": { - "0:10": { - "Count:3": 8, - "id:8": "gregtech:metal_casing" - }, - "1:10": { - "Count:3": 1, - "Damage:2": 1652, - "id:8": "gregtech:machine" - }, - "2:10": { - "Count:3": 1, - "Damage:2": 1651, - "id:8": "gregtech:machine" - }, - "3:10": { - "Count:3": 1, - "Damage:2": 1653, - "id:8": "gregtech:machine" - }, - "4:10": { - "Count:3": 1, - "id:8": "gregtech:boiler_firebox_casing" - }, - "5:10": { - "Count:3": 1, - "Damage:2": 1024, - "id:8": "gregtech:machine" - } - }, - "taskID:8": "bq_standard:retrieval" - } - } - }, - "177:10": { "preRequisites:11": [ 31 ], @@ -7280,7 +7214,7 @@ } } }, - "178:10": { + "177:10": { "preRequisites:11": [ 174, 175 @@ -7309,7 +7243,7 @@ } } }, - "179:10": { + "178:10": { "preRequisiteTypes:7": [ 2 ], @@ -7345,7 +7279,7 @@ } } }, - "180:10": { + "179:10": { "preRequisites:11": [ 178 ], @@ -7373,7 +7307,7 @@ } } }, - "181:10": { + "180:10": { "preRequisites:11": [ 180 ], @@ -7401,7 +7335,7 @@ } } }, - "182:10": { + "181:10": { "preRequisites:11": [ 131 ], @@ -7421,7 +7355,7 @@ "rewards:9": {}, "tasks:9": {} }, - "183:10": { + "182:10": { "preRequisites:11": [ 128, 126 @@ -7465,7 +7399,7 @@ } } }, - "184:10": { + "183:10": { "preRequisites:11": [ 183 ], @@ -7499,7 +7433,7 @@ } } }, - "185:10": { + "184:10": { "preRequisites:11": [ 184 ], @@ -7538,7 +7472,7 @@ } } }, - "186:10": { + "185:10": { "preRequisites:11": [ 105 ], @@ -7571,7 +7505,7 @@ } } }, - "187:10": { + "186:10": { "preRequisites:11": [ 21 ], @@ -7605,7 +7539,7 @@ } } }, - "188:10": { + "187:10": { "preRequisiteTypes:7": [ 1 ], @@ -7656,7 +7590,7 @@ } } }, - "189:10": { + "188:10": { "preRequisites:11": [ 185, 114 @@ -7691,7 +7625,7 @@ } } }, - "190:10": { + "189:10": { "preRequisites:11": [ 188, 189 @@ -7726,7 +7660,7 @@ } } }, - "191:10": { + "190:10": { "preRequisites:11": [ 101 ], @@ -7760,7 +7694,7 @@ } } }, - "192:10": { + "191:10": { "preRequisites:11": [ 191 ], @@ -7792,7 +7726,7 @@ } } }, - "193:10": { + "192:10": { "preRequisites:11": [ 192 ], @@ -7830,7 +7764,7 @@ } } }, - "194:10": { + "193:10": { "preRequisites:11": [ 193 ], @@ -7877,7 +7811,7 @@ } } }, - "195:10": { + "194:10": { "preRequisites:11": [ 193 ], @@ -7912,7 +7846,7 @@ } } }, - "196:10": { + "195:10": { "preRequisites:11": [ 191 ], @@ -7959,7 +7893,7 @@ } } }, - "197:10": { + "196:10": { "preRequisites:11": [ 191 ], @@ -8006,7 +7940,7 @@ } } }, - "198:10": { + "197:10": { "preRequisites:11": [ 500 ], @@ -8045,7 +7979,7 @@ } } }, - "199:10": { + "198:10": { "preRequisites:11": [ 198, 112 @@ -8085,7 +8019,7 @@ } } }, - "200:10": { + "199:10": { "preRequisites:11": [ 184, 198 @@ -8120,7 +8054,7 @@ } } }, - "201:10": { + "200:10": { "preRequisites:11": [ 190 ], @@ -8154,7 +8088,7 @@ } } }, - "202:10": { + "201:10": { "preRequisites:11": [ 201, 200 @@ -8190,7 +8124,7 @@ } } }, - "203:10": { + "202:10": { "preRequisites:11": [ 202 ], @@ -8224,7 +8158,7 @@ } } }, - "204:10": { + "203:10": { "preRequisites:11": [ 186 ], @@ -8257,7 +8191,7 @@ } } }, - "205:10": { + "204:10": { "preRequisites:11": [ 102 ], @@ -8290,7 +8224,7 @@ } } }, - "206:10": { + "205:10": { "preRequisites:11": [ 128 ], @@ -8320,7 +8254,7 @@ } } }, - "207:10": { + "206:10": { "preRequisites:11": [ 185 ], @@ -8354,7 +8288,7 @@ } } }, - "208:10": { + "207:10": { "preRequisites:11": [ 25 ], @@ -8386,7 +8320,7 @@ } } }, - "209:10": { + "208:10": { "preRequisites:11": [ 208 ], @@ -8422,7 +8356,7 @@ } } }, - "210:10": { + "209:10": { "preRequisites:11": [ 418, 25 @@ -8504,7 +8438,7 @@ } } }, - "211:10": { + "210:10": { "preRequisites:11": [ 210 ], @@ -8550,7 +8484,7 @@ } } }, - "212:10": { + "211:10": { "preRequisites:11": [ 210 ], @@ -8592,7 +8526,7 @@ } } }, - "213:10": { + "212:10": { "preRequisites:11": [ 25 ], @@ -8624,7 +8558,7 @@ } } }, - "214:10": { + "213:10": { "preRequisites:11": [ 213 ], @@ -8656,7 +8590,7 @@ } } }, - "215:10": { + "214:10": { "preRequisites:11": [ 213 ], @@ -8688,7 +8622,7 @@ } } }, - "216:10": { + "215:10": { "preRequisites:11": [ 213 ], @@ -8720,7 +8654,7 @@ } } }, - "217:10": { + "216:10": { "preRequisites:11": [ 213 ], @@ -8753,7 +8687,7 @@ } } }, - "218:10": { + "217:10": { "preRequisites:11": [ 213 ], @@ -8787,7 +8721,7 @@ } } }, - "219:10": { + "218:10": { "preRequisites:11": [ 87 ], @@ -8819,7 +8753,7 @@ } } }, - "220:10": { + "219:10": { "preRequisites:11": [ 87 ], @@ -8844,7 +8778,7 @@ } } }, - "221:10": { + "220:10": { "preRequisites:11": [ 119 ], @@ -8878,7 +8812,7 @@ } } }, - "222:10": { + "221:10": { "preRequisites:11": [ 221 ], @@ -8912,7 +8846,7 @@ } } }, - "223:10": { + "222:10": { "preRequisites:11": [ 102 ], @@ -8945,7 +8879,7 @@ } } }, - "224:10": { + "223:10": { "preRequisites:11": [ 99 ], @@ -8979,7 +8913,7 @@ } } }, - "225:10": { + "224:10": { "preRequisites:11": [ 16 ], @@ -9047,7 +8981,7 @@ } } }, - "226:10": { + "225:10": { "preRequisites:11": [ 142 ], @@ -9080,7 +9014,7 @@ } } }, - "227:10": { + "226:10": { "preRequisites:11": [ 87 ], @@ -9105,7 +9039,7 @@ } } }, - "228:10": { + "227:10": { "preRequisites:11": [ 45 ], @@ -9137,7 +9071,7 @@ } } }, - "229:10": { + "228:10": { "preRequisites:11": [ 12 ], @@ -9171,7 +9105,7 @@ } } }, - "230:10": { + "229:10": { "preRequisites:11": [ 51 ], @@ -9238,7 +9172,7 @@ } } }, - "231:10": { + "230:10": { "preRequisites:11": [ 22 ], @@ -9289,7 +9223,7 @@ } } }, - "232:10": { + "231:10": { "preRequisites:11": [ 46, 109 @@ -9328,7 +9262,7 @@ } } }, - "233:10": { + "232:10": { "preRequisites:11": [ 232 ], @@ -9366,7 +9300,7 @@ } } }, - "234:10": { + "233:10": { "preRequisites:11": [ 381 ], @@ -9404,7 +9338,7 @@ } } }, - "235:10": { + "234:10": { "preRequisites:11": [ 234, 233 @@ -9442,7 +9376,7 @@ } } }, - "236:10": { + "235:10": { "preRequisites:11": [ 126 ], @@ -9476,7 +9410,7 @@ } } }, - "237:10": { + "236:10": { "preRequisites:11": [ 236, 188 @@ -9511,7 +9445,7 @@ } } }, - "238:10": { + "237:10": { "preRequisites:11": [ 464, 463 @@ -9545,7 +9479,7 @@ } } }, - "239:10": { + "238:10": { "preRequisiteTypes:7": [ 1 ], @@ -9581,7 +9515,7 @@ } } }, - "240:10": { + "239:10": { "preRequisiteTypes:7": [ 1 ], @@ -9622,7 +9556,7 @@ } } }, - "241:10": { + "240:10": { "preRequisites:11": [ 240, 446 @@ -9656,7 +9590,7 @@ } } }, - "242:10": { + "241:10": { "preRequisites:11": [ 241, 239 @@ -9691,7 +9625,7 @@ } } }, - "243:10": { + "242:10": { "preRequisiteTypes:7": [ 0, 1 @@ -9730,7 +9664,7 @@ } } }, - "244:10": { + "243:10": { "preRequisites:11": [ 66 ], @@ -9761,7 +9695,7 @@ } } }, - "245:10": { + "244:10": { "preRequisites:11": [ 31 ], @@ -9813,7 +9747,7 @@ } } }, - "246:10": { + "245:10": { "preRequisites:11": [ 219 ], @@ -9952,7 +9886,7 @@ } } }, - "247:10": { + "246:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -9983,7 +9917,7 @@ } } }, - "248:10": { + "247:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10014,7 +9948,7 @@ } } }, - "249:10": { + "248:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10045,7 +9979,7 @@ } } }, - "250:10": { + "249:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10076,7 +10010,7 @@ } } }, - "251:10": { + "250:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10107,7 +10041,7 @@ } } }, - "252:10": { + "251:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10138,7 +10072,7 @@ } } }, - "253:10": { + "252:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10169,7 +10103,7 @@ } } }, - "254:10": { + "253:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10200,7 +10134,7 @@ } } }, - "255:10": { + "254:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10231,7 +10165,7 @@ } } }, - "256:10": { + "255:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10262,7 +10196,7 @@ } } }, - "257:10": { + "256:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10293,7 +10227,7 @@ } } }, - "258:10": { + "257:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10324,7 +10258,7 @@ } } }, - "259:10": { + "258:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10355,7 +10289,7 @@ } } }, - "260:10": { + "259:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10386,7 +10320,7 @@ } } }, - "261:10": { + "260:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10417,7 +10351,7 @@ } } }, - "262:10": { + "261:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10448,7 +10382,7 @@ } } }, - "263:10": { + "262:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10479,7 +10413,7 @@ } } }, - "264:10": { + "263:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10510,7 +10444,7 @@ } } }, - "265:10": { + "264:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10542,7 +10476,7 @@ } } }, - "266:10": { + "265:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10573,7 +10507,7 @@ } } }, - "267:10": { + "266:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10604,7 +10538,7 @@ } } }, - "268:10": { + "267:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10635,7 +10569,7 @@ } } }, - "269:10": { + "268:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10666,7 +10600,7 @@ } } }, - "270:10": { + "269:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10697,7 +10631,7 @@ } } }, - "271:10": { + "270:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10728,7 +10662,7 @@ } } }, - "272:10": { + "271:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10759,7 +10693,7 @@ } } }, - "273:10": { + "272:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10790,7 +10724,7 @@ } } }, - "274:10": { + "273:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10821,7 +10755,7 @@ } } }, - "275:10": { + "274:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10852,7 +10786,7 @@ } } }, - "276:10": { + "275:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10883,7 +10817,7 @@ } } }, - "277:10": { + "276:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10914,7 +10848,7 @@ } } }, - "278:10": { + "277:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10945,7 +10879,7 @@ } } }, - "279:10": { + "278:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -10976,7 +10910,7 @@ } } }, - "280:10": { + "279:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11007,7 +10941,7 @@ } } }, - "281:10": { + "280:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11039,7 +10973,7 @@ } } }, - "282:10": { + "281:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11070,7 +11004,7 @@ } } }, - "283:10": { + "282:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11101,7 +11035,7 @@ } } }, - "284:10": { + "283:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11132,7 +11066,7 @@ } } }, - "285:10": { + "284:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11163,7 +11097,7 @@ } } }, - "286:10": { + "285:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11194,7 +11128,7 @@ } } }, - "287:10": { + "286:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11225,7 +11159,7 @@ } } }, - "288:10": { + "287:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11256,7 +11190,7 @@ } } }, - "289:10": { + "288:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11287,7 +11221,7 @@ } } }, - "290:10": { + "289:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11318,7 +11252,7 @@ } } }, - "291:10": { + "290:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11341,7 +11275,7 @@ } } }, - "292:10": { + "291:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11372,7 +11306,7 @@ } } }, - "293:10": { + "292:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11403,7 +11337,7 @@ } } }, - "294:10": { + "293:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11434,7 +11368,7 @@ } } }, - "295:10": { + "294:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11465,7 +11399,7 @@ } } }, - "296:10": { + "295:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11496,7 +11430,7 @@ } } }, - "297:10": { + "296:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11527,7 +11461,7 @@ } } }, - "298:10": { + "297:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11558,7 +11492,7 @@ } } }, - "299:10": { + "298:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11589,7 +11523,7 @@ } } }, - "300:10": { + "299:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11620,7 +11554,7 @@ } } }, - "301:10": { + "300:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11651,7 +11585,7 @@ } } }, - "302:10": { + "301:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11682,7 +11616,7 @@ } } }, - "303:10": { + "302:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11713,7 +11647,7 @@ } } }, - "304:10": { + "303:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11734,7 +11668,7 @@ } } }, - "305:10": { + "304:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11765,7 +11699,7 @@ } } }, - "306:10": { + "305:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11796,7 +11730,7 @@ } } }, - "307:10": { + "306:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11828,7 +11762,7 @@ } } }, - "308:10": { + "307:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11860,7 +11794,7 @@ } } }, - "309:10": { + "308:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11891,7 +11825,7 @@ } } }, - "310:10": { + "309:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11922,7 +11856,7 @@ } } }, - "311:10": { + "310:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11953,7 +11887,7 @@ } } }, - "312:10": { + "311:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -11984,7 +11918,7 @@ } } }, - "313:10": { + "312:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12015,7 +11949,7 @@ } } }, - "314:10": { + "313:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12047,7 +11981,7 @@ } } }, - "315:10": { + "314:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12078,7 +12012,7 @@ } } }, - "316:10": { + "315:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12109,7 +12043,7 @@ } } }, - "317:10": { + "316:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12130,7 +12064,7 @@ } } }, - "318:10": { + "317:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12151,7 +12085,7 @@ } } }, - "319:10": { + "318:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12182,7 +12116,7 @@ } } }, - "320:10": { + "319:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12213,7 +12147,7 @@ } } }, - "321:10": { + "320:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12244,7 +12178,7 @@ } } }, - "322:10": { + "321:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12275,7 +12209,7 @@ } } }, - "323:10": { + "322:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12306,7 +12240,7 @@ } } }, - "324:10": { + "323:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12337,7 +12271,7 @@ } } }, - "325:10": { + "324:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12368,7 +12302,7 @@ } } }, - "326:10": { + "325:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12399,7 +12333,7 @@ } } }, - "327:10": { + "326:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12430,7 +12364,7 @@ } } }, - "328:10": { + "327:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12461,7 +12395,7 @@ } } }, - "329:10": { + "328:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12492,7 +12426,7 @@ } } }, - "330:10": { + "329:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12523,7 +12457,7 @@ } } }, - "331:10": { + "330:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12554,7 +12488,7 @@ } } }, - "332:10": { + "331:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12585,7 +12519,7 @@ } } }, - "333:10": { + "332:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12616,7 +12550,7 @@ } } }, - "334:10": { + "333:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12647,7 +12581,7 @@ } } }, - "335:10": { + "334:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12668,7 +12602,7 @@ } } }, - "336:10": { + "335:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12689,7 +12623,7 @@ } } }, - "337:10": { + "336:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12711,7 +12645,7 @@ } } }, - "338:10": { + "337:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12732,7 +12666,7 @@ } } }, - "339:10": { + "338:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12763,7 +12697,7 @@ } } }, - "340:10": { + "339:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12794,7 +12728,7 @@ } } }, - "341:10": { + "340:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12815,7 +12749,7 @@ } } }, - "342:10": { + "341:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12846,7 +12780,7 @@ } } }, - "343:10": { + "342:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12877,7 +12811,7 @@ } } }, - "344:10": { + "343:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12898,7 +12832,7 @@ } } }, - "345:10": { + "344:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12919,7 +12853,7 @@ } } }, - "346:10": { + "345:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12940,7 +12874,7 @@ } } }, - "347:10": { + "346:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12961,7 +12895,7 @@ } } }, - "348:10": { + "347:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -12982,7 +12916,7 @@ } } }, - "349:10": { + "348:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13003,7 +12937,7 @@ } } }, - "350:10": { + "349:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13024,7 +12958,7 @@ } } }, - "351:10": { + "350:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13045,7 +12979,7 @@ } } }, - "352:10": { + "351:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13066,7 +13000,7 @@ } } }, - "353:10": { + "352:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13087,7 +13021,7 @@ } } }, - "354:10": { + "353:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13104,16 +13038,11 @@ "rewards:9": {}, "tasks:9": { "0:10": { - "allowAnvil:1": 0, - "allowCraft:1": 1, - "allowSmelt:1": 1, - "partialMatch:1": 1, - "requiredItems:9": {}, - "taskID:8": "bq_standard:crafting" + "taskID:8": "bq_standard:checkbox" } } }, - "355:10": { + "354:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13134,7 +13063,7 @@ } } }, - "356:10": { + "355:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13155,7 +13084,7 @@ } } }, - "357:10": { + "356:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13176,7 +13105,7 @@ } } }, - "358:10": { + "357:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13197,7 +13126,7 @@ } } }, - "359:10": { + "358:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13218,7 +13147,7 @@ } } }, - "360:10": { + "359:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13239,7 +13168,7 @@ } } }, - "361:10": { + "360:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13260,7 +13189,7 @@ } } }, - "362:10": { + "361:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13281,7 +13210,7 @@ } } }, - "363:10": { + "362:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13303,7 +13232,7 @@ } } }, - "364:10": { + "363:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13324,7 +13253,7 @@ } } }, - "365:10": { + "364:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -13345,7 +13274,7 @@ } } }, - "366:10": { + "365:10": { "preRequisites:11": [ 21 ], @@ -13376,7 +13305,7 @@ } } }, - "367:10": { + "366:10": { "preRequisiteTypes:7": [ 2 ], @@ -13404,7 +13333,7 @@ } } }, - "368:10": { + "367:10": { "preRequisites:11": [ 236 ], @@ -13438,7 +13367,7 @@ } } }, - "369:10": { + "368:10": { "preRequisites:11": [ 222, 686, @@ -13492,7 +13421,7 @@ } } }, - "370:10": { + "369:10": { "preRequisites:11": [ 102 ], @@ -13534,7 +13463,7 @@ } } }, - "371:10": { + "370:10": { "preRequisites:11": [ 476 ], @@ -13573,7 +13502,7 @@ } } }, - "372:10": { + "371:10": { "preRequisites:11": [ 188 ], @@ -13604,7 +13533,7 @@ } } }, - "373:10": { + "372:10": { "preRequisites:11": [ 181, 410, @@ -13659,7 +13588,7 @@ } } }, - "374:10": { + "373:10": { "preRequisites:11": [ 102 ], @@ -13708,7 +13637,7 @@ } } }, - "375:10": { + "374:10": { "preRequisites:11": [ 31 ], @@ -13754,7 +13683,7 @@ } } }, - "376:10": { + "375:10": { "preRequisites:11": [ 375 ], @@ -13785,7 +13714,7 @@ } } }, - "377:10": { + "376:10": { "preRequisites:11": [ 379 ], @@ -13839,7 +13768,7 @@ } } }, - "378:10": { + "377:10": { "preRequisites:11": [ 379 ], @@ -13906,7 +13835,7 @@ } } }, - "379:10": { + "378:10": { "preRequisites:11": [ 440 ], @@ -13938,7 +13867,7 @@ } } }, - "380:10": { + "379:10": { "preRequisites:11": [ 36, 161 @@ -13987,7 +13916,7 @@ } } }, - "381:10": { + "380:10": { "preRequisites:11": [ 122 ], @@ -14034,7 +13963,7 @@ } } }, - "382:10": { + "381:10": { "preRequisites:11": [ 408 ], @@ -14067,7 +13996,7 @@ } } }, - "383:10": { + "382:10": { "preRequisites:11": [ 380 ], @@ -14098,7 +14027,7 @@ } } }, - "384:10": { + "383:10": { "preRequisites:11": [ 191 ], @@ -14129,7 +14058,7 @@ } } }, - "385:10": { + "384:10": { "preRequisites:11": [ 384 ], @@ -14172,7 +14101,7 @@ } } }, - "386:10": { + "385:10": { "preRequisites:11": [ 384 ], @@ -14204,7 +14133,7 @@ } } }, - "387:10": { + "386:10": { "preRequisiteTypes:7": [ 0, 1 @@ -14248,7 +14177,7 @@ } } }, - "388:10": { + "387:10": { "preRequisites:11": [ 102 ], @@ -14281,7 +14210,7 @@ } } }, - "389:10": { + "388:10": { "preRequisites:11": [ 388 ], @@ -14314,7 +14243,7 @@ } } }, - "390:10": { + "389:10": { "preRequisites:11": [ 436 ], @@ -14341,7 +14270,7 @@ } } }, - "391:10": { + "390:10": { "preRequisiteTypes:7": [ 0, 1 @@ -14390,7 +14319,7 @@ } } }, - "392:10": { + "391:10": { "preRequisites:11": [ 16 ], @@ -14447,7 +14376,7 @@ } } }, - "393:10": { + "392:10": { "preRequisites:11": [ 104 ], @@ -14490,7 +14419,7 @@ } } }, - "394:10": { + "393:10": { "preRequisites:11": [ 374, 373, @@ -14517,7 +14446,7 @@ } } }, - "395:10": { + "394:10": { "preRequisiteTypes:7": [ 1 ], @@ -14558,7 +14487,7 @@ } } }, - "396:10": { + "395:10": { "preRequisites:11": [ 395 ], @@ -14597,7 +14526,7 @@ } } }, - "397:10": { + "396:10": { "preRequisites:11": [ 396, 659 @@ -14637,7 +14566,7 @@ } } }, - "398:10": { + "397:10": { "preRequisites:11": [ 397, 391 @@ -14672,7 +14601,7 @@ } } }, - "399:10": { + "398:10": { "preRequisites:11": [ 236, 243 @@ -14707,7 +14636,7 @@ } } }, - "400:10": { + "399:10": { "preRequisites:11": [ 243 ], @@ -14742,7 +14671,7 @@ } } }, - "401:10": { + "400:10": { "preRequisites:11": [ 399 ], @@ -14776,7 +14705,7 @@ } } }, - "402:10": { + "401:10": { "preRequisites:11": [ 401, 592 @@ -14811,7 +14740,7 @@ } } }, - "403:10": { + "402:10": { "preRequisites:11": [ 174 ], @@ -14844,10 +14773,11 @@ } } }, - "404:10": { + "403:10": { "preRequisites:11": [ 405, - 402 + 402, + 459 ], "properties:10": { "betterquesting:10": { @@ -14879,7 +14809,7 @@ } } }, - "405:10": { + "404:10": { "preRequisites:11": [ 81 ], @@ -14913,7 +14843,7 @@ } } }, - "406:10": { + "405:10": { "preRequisiteTypes:7": [ 0, 1 @@ -14961,7 +14891,7 @@ } } }, - "407:10": { + "406:10": { "preRequisites:11": [ 409 ], @@ -14999,7 +14929,7 @@ } } }, - "408:10": { + "407:10": { "preRequisites:11": [ 407, 233, @@ -15028,7 +14958,7 @@ "requiredFluids:9": { "0:10": { "Amount:3": 1000, - "FluidName:8": "seed_oil" + "FluidName:8": "glyceryl_trinitrate" } }, "taskID:8": "bq_standard:fluid" @@ -15039,7 +14969,7 @@ } } }, - "409:10": { + "408:10": { "preRequisites:11": [ 205 ], @@ -15087,7 +15017,7 @@ } } }, - "410:10": { + "409:10": { "preRequisites:11": [ 407 ], @@ -15120,7 +15050,7 @@ } } }, - "411:10": { + "410:10": { "preRequisites:11": [ 381 ], @@ -15158,7 +15088,7 @@ } } }, - "412:10": { + "411:10": { "preRequisites:11": [ 654 ], @@ -15189,7 +15119,7 @@ } } }, - "413:10": { + "412:10": { "preRequisiteTypes:7": [ 0, 1 @@ -15231,7 +15161,7 @@ } } }, - "414:10": { + "413:10": { "preRequisites:11": [ 381 ], @@ -15269,7 +15199,7 @@ } } }, - "415:10": { + "414:10": { "preRequisites:11": [ 109 ], @@ -15307,7 +15237,7 @@ } } }, - "416:10": { + "415:10": { "preRequisites:11": [ 414 ], @@ -15345,7 +15275,7 @@ } } }, - "417:10": { + "416:10": { "preRequisites:11": [ 415, 393 @@ -15385,7 +15315,7 @@ } } }, - "418:10": { + "417:10": { "preRequisites:11": [ 12 ], @@ -15419,7 +15349,7 @@ } } }, - "419:10": { + "418:10": { "preRequisites:11": [ 104 ], @@ -15444,7 +15374,7 @@ } } }, - "420:10": { + "419:10": { "preRequisites:11": [ 419 ], @@ -15517,7 +15447,7 @@ } } }, - "421:10": { + "420:10": { "preRequisites:11": [ 418, 419 @@ -15579,7 +15509,7 @@ } } }, - "422:10": { + "421:10": { "preRequisites:11": [ 34 ], @@ -15613,7 +15543,7 @@ } } }, - "423:10": { + "422:10": { "preRequisites:11": [ 139, 141 @@ -15647,7 +15577,7 @@ } } }, - "424:10": { + "423:10": { "preRequisiteTypes:7": [ 0, 1 @@ -15685,7 +15615,7 @@ } } }, - "425:10": { + "424:10": { "preRequisites:11": [ 0 ], @@ -15721,7 +15651,7 @@ } } }, - "426:10": { + "425:10": { "preRequisites:11": [ 186 ], @@ -15764,7 +15694,7 @@ } } }, - "427:10": { + "426:10": { "preRequisites:11": [ 428 ], @@ -15824,7 +15754,7 @@ } } }, - "428:10": { + "427:10": { "preRequisiteTypes:7": [ 0, 1 @@ -15895,7 +15825,7 @@ } } }, - "429:10": { + "428:10": { "preRequisites:11": [ 45 ], @@ -15928,7 +15858,7 @@ } } }, - "430:10": { + "429:10": { "preRequisites:11": [ 427, 426 @@ -15962,7 +15892,7 @@ } } }, - "431:10": { + "430:10": { "preRequisites:11": [ 430 ], @@ -15995,7 +15925,7 @@ } } }, - "432:10": { + "431:10": { "preRequisites:11": [ 388 ], @@ -16022,7 +15952,7 @@ } } }, - "433:10": { + "432:10": { "preRequisites:11": [ 429, 243, @@ -16075,7 +16005,7 @@ } } }, - "434:10": { + "433:10": { "preRequisites:11": [ 433 ], @@ -16123,7 +16053,7 @@ } } }, - "435:10": { + "434:10": { "preRequisites:11": [ 432 ], @@ -16150,7 +16080,7 @@ } } }, - "436:10": { + "435:10": { "preRequisites:11": [ 435 ], @@ -16177,7 +16107,7 @@ } } }, - "437:10": { + "436:10": { "preRequisites:11": [ 22, 49 @@ -16202,7 +16132,7 @@ } } }, - "438:10": { + "437:10": { "preRequisites:11": [ 369, 787, @@ -16250,7 +16180,7 @@ } } }, - "439:10": { + "438:10": { "preRequisites:11": [ 378 ], @@ -16275,7 +16205,7 @@ } } }, - "440:10": { + "439:10": { "preRequisiteTypes:7": [ 1, 0 @@ -16314,7 +16244,7 @@ } } }, - "441:10": { + "440:10": { "preRequisiteTypes:7": [ 1 ], @@ -16341,7 +16271,7 @@ } } }, - "442:10": { + "441:10": { "preRequisites:11": [ 87 ], @@ -16377,7 +16307,7 @@ } } }, - "443:10": { + "442:10": { "preRequisiteTypes:7": [ 0, 1 @@ -16425,7 +16355,7 @@ } } }, - "444:10": { + "443:10": { "preRequisites:11": [ 22 ], @@ -16460,7 +16390,7 @@ } } }, - "445:10": { + "444:10": { "preRequisites:11": [ 444 ], @@ -16503,7 +16433,7 @@ } } }, - "446:10": { + "445:10": { "preRequisites:11": [ 447 ], @@ -16538,7 +16468,7 @@ } } }, - "447:10": { + "446:10": { "preRequisiteTypes:7": [ 1 ], @@ -16575,7 +16505,7 @@ } } }, - "448:10": { + "447:10": { "preRequisites:11": [ 444 ], @@ -16606,7 +16536,7 @@ } } }, - "449:10": { + "448:10": { "preRequisites:11": [], "properties:10": { "betterquesting:10": { @@ -16629,7 +16559,7 @@ } } }, - "450:10": { + "449:10": { "preRequisites:11": [ 243 ], @@ -16653,7 +16583,7 @@ } } }, - "451:10": { + "450:10": { "preRequisites:11": [ 463, 464 @@ -16688,7 +16618,7 @@ } } }, - "452:10": { + "451:10": { "preRequisites:11": [ 453, 866, @@ -16729,7 +16659,7 @@ } } }, - "453:10": { + "452:10": { "preRequisites:11": [ 454, 455 @@ -16768,7 +16698,7 @@ } } }, - "454:10": { + "453:10": { "preRequisites:11": [ 174 ], @@ -16806,7 +16736,7 @@ } } }, - "455:10": { + "454:10": { "preRequisites:11": [ 443 ], @@ -16844,7 +16774,7 @@ } } }, - "456:10": { + "455:10": { "preRequisites:11": [ 452 ], @@ -16878,7 +16808,7 @@ } } }, - "457:10": { + "456:10": { "preRequisites:11": [ 456 ], @@ -16912,7 +16842,7 @@ } } }, - "458:10": { + "457:10": { "preRequisites:11": [ 457, 459 @@ -16952,7 +16882,7 @@ } } }, - "459:10": { + "458:10": { "preRequisites:11": [ 462 ], @@ -16991,7 +16921,7 @@ } } }, - "460:10": { + "459:10": { "preRequisites:11": [ 399 ], @@ -17027,7 +16957,7 @@ } } }, - "461:10": { + "460:10": { "preRequisites:11": [ 460 ], @@ -17061,7 +16991,7 @@ } } }, - "462:10": { + "461:10": { "preRequisites:11": [ 461 ], @@ -17106,7 +17036,7 @@ } } }, - "463:10": { + "462:10": { "preRequisites:11": [ 466, 207 @@ -17141,7 +17071,7 @@ } } }, - "464:10": { + "463:10": { "preRequisites:11": [ 123 ], @@ -17175,7 +17105,7 @@ } } }, - "465:10": { + "464:10": { "preRequisites:11": [ 670 ], @@ -17208,7 +17138,7 @@ } } }, - "466:10": { + "465:10": { "preRequisites:11": [ 81 ], @@ -17261,7 +17191,7 @@ } } }, - "467:10": { + "466:10": { "preRequisites:11": [ 242 ], @@ -17295,7 +17225,7 @@ } } }, - "468:10": { + "467:10": { "preRequisites:11": [ 243 ], @@ -17329,7 +17259,7 @@ } } }, - "469:10": { + "468:10": { "preRequisites:11": [ 468 ], @@ -17368,7 +17298,7 @@ } } }, - "470:10": { + "469:10": { "preRequisites:11": [ 468 ], @@ -17407,7 +17337,7 @@ } } }, - "471:10": { + "470:10": { "preRequisites:11": [ 468 ], @@ -17446,7 +17376,7 @@ } } }, - "472:10": { + "471:10": { "preRequisites:11": [ 99 ], @@ -17480,7 +17410,7 @@ } } }, - "473:10": { + "472:10": { "preRequisites:11": [ 661 ], @@ -17513,7 +17443,7 @@ } } }, - "474:10": { + "473:10": { "preRequisites:11": [ 661 ], @@ -17546,7 +17476,7 @@ } } }, - "475:10": { + "474:10": { "preRequisiteTypes:7": [ 1, 1 @@ -17584,7 +17514,7 @@ } } }, - "476:10": { + "475:10": { "preRequisites:11": [ 477 ], @@ -17618,7 +17548,7 @@ } } }, - "477:10": { + "476:10": { "preRequisites:11": [ 598 ], @@ -17652,7 +17582,7 @@ } } }, - "478:10": { + "477:10": { "preRequisites:11": [ 458, 476, @@ -17689,7 +17619,7 @@ } } }, - "479:10": { + "478:10": { "preRequisiteTypes:7": [ 1, 0 @@ -17728,7 +17658,7 @@ } } }, - "480:10": { + "479:10": { "preRequisites:11": [ 478 ], @@ -17762,7 +17692,7 @@ } } }, - "481:10": { + "480:10": { "preRequisites:11": [ 398, 486 @@ -17798,7 +17728,7 @@ } } }, - "482:10": { + "481:10": { "preRequisites:11": [ 485 ], @@ -17831,7 +17761,7 @@ } } }, - "483:10": { + "482:10": { "preRequisiteTypes:7": [ 1, 0 @@ -17875,7 +17805,7 @@ } } }, - "484:10": { + "483:10": { "preRequisites:11": [ 483 ], @@ -17913,7 +17843,7 @@ } } }, - "485:10": { + "484:10": { "preRequisiteTypes:7": [ 1 ], @@ -17954,7 +17884,7 @@ } } }, - "486:10": { + "485:10": { "preRequisites:11": [ 482, 484, @@ -17989,7 +17919,7 @@ } } }, - "487:10": { + "486:10": { "preRequisites:11": [ 486 ], @@ -18022,7 +17952,7 @@ } } }, - "488:10": { + "487:10": { "preRequisites:11": [ 481, 452 @@ -18057,7 +17987,7 @@ } } }, - "489:10": { + "488:10": { "preRequisites:11": [ 205 ], @@ -18095,7 +18025,7 @@ } } }, - "490:10": { + "489:10": { "preRequisites:11": [ 110 ], @@ -18133,7 +18063,7 @@ } } }, - "491:10": { + "490:10": { "preRequisites:11": [ 489, 490, @@ -18170,7 +18100,7 @@ } } }, - "492:10": { + "491:10": { "preRequisites:11": [ 480 ], @@ -18203,7 +18133,7 @@ } } }, - "493:10": { + "492:10": { "preRequisites:11": [ 480 ], @@ -18236,7 +18166,7 @@ } } }, - "494:10": { + "493:10": { "preRequisites:11": [ 480, 492, @@ -18273,7 +18203,7 @@ } } }, - "495:10": { + "494:10": { "preRequisites:11": [ 494 ], @@ -18307,7 +18237,7 @@ } } }, - "496:10": { + "495:10": { "preRequisites:11": [ 514, 513 @@ -18343,7 +18273,7 @@ } } }, - "497:10": { + "496:10": { "preRequisites:11": [ 496, 494 @@ -18378,7 +18308,7 @@ } } }, - "498:10": { + "497:10": { "preRequisites:11": [ 653 ], @@ -18412,7 +18342,7 @@ } } }, - "499:10": { + "498:10": { "preRequisites:11": [ 188 ], @@ -18445,7 +18375,7 @@ } } }, - "500:10": { + "499:10": { "preRequisites:11": [ 9, 109 @@ -18479,7 +18409,7 @@ } } }, - "501:10": { + "500:10": { "preRequisites:11": [ 378, 506 @@ -18514,12 +18444,13 @@ } } }, - "502:10": { + "501:10": { "preRequisites:11": [ 501, 500, 499, - 503 + 503, + 498 ], "properties:10": { "betterquesting:10": { @@ -18551,7 +18482,7 @@ } } }, - "503:10": { + "502:10": { "preRequisites:11": [ 504 ], @@ -18589,7 +18520,7 @@ } } }, - "504:10": { + "503:10": { "preRequisites:11": [ 188 ], @@ -18622,7 +18553,7 @@ } } }, - "505:10": { + "504:10": { "preRequisites:11": [ 599, 685 @@ -18666,9 +18597,8 @@ } } }, - "506:10": { + "505:10": { "preRequisites:11": [ - 498, 509, 394 ], @@ -18716,7 +18646,7 @@ } } }, - "507:10": { + "506:10": { "preRequisites:11": [ 81 ], @@ -18761,7 +18691,7 @@ } } }, - "508:10": { + "507:10": { "preRequisites:11": [ 507 ], @@ -18795,7 +18725,7 @@ } } }, - "509:10": { + "508:10": { "preRequisites:11": [ 508 ], @@ -18834,7 +18764,7 @@ } } }, - "510:10": { + "509:10": { "preRequisites:11": [ 243 ], @@ -18888,7 +18818,7 @@ } } }, - "511:10": { + "510:10": { "preRequisites:11": [ 510 ], @@ -18922,7 +18852,7 @@ } } }, - "512:10": { + "511:10": { "preRequisites:11": [ 511 ], @@ -18956,7 +18886,7 @@ } } }, - "513:10": { + "512:10": { "preRequisites:11": [ 512 ], @@ -18990,7 +18920,7 @@ } } }, - "514:10": { + "513:10": { "preRequisites:11": [ 512 ], @@ -19024,7 +18954,7 @@ } } }, - "515:10": { + "514:10": { "preRequisites:11": [ 510 ], @@ -19057,7 +18987,7 @@ } } }, - "516:10": { + "515:10": { "preRequisites:11": [ 243, 519 @@ -19119,7 +19049,7 @@ } } }, - "517:10": { + "516:10": { "preRequisites:11": [ 661 ], @@ -19162,7 +19092,7 @@ } } }, - "518:10": { + "517:10": { "preRequisites:11": [ 32 ], @@ -19195,7 +19125,7 @@ } } }, - "519:10": { + "518:10": { "preRequisites:11": [ 243 ], @@ -19233,7 +19163,7 @@ } } }, - "520:10": { + "519:10": { "preRequisites:11": [ 519, 637 @@ -19272,7 +19202,7 @@ } } }, - "521:10": { + "520:10": { "preRequisites:11": [ 243 ], @@ -19315,7 +19245,7 @@ } } }, - "522:10": { + "521:10": { "preRequisites:11": [ 521 ], @@ -19346,7 +19276,7 @@ } } }, - "523:10": { + "522:10": { "preRequisites:11": [ 521 ], @@ -19379,7 +19309,7 @@ } } }, - "524:10": { + "523:10": { "preRequisites:11": [ 523, 522 @@ -19412,7 +19342,7 @@ } } }, - "525:10": { + "524:10": { "preRequisites:11": [ 524 ], @@ -21222,7 +21152,7 @@ } } }, - "526:10": { + "525:10": { "preRequisites:11": [ 525 ], @@ -21253,7 +21183,7 @@ } } }, - "527:10": { + "526:10": { "preRequisites:11": [ 525 ], @@ -21319,7 +21249,7 @@ } } }, - "528:10": { + "527:10": { "preRequisites:11": [ 525 ], @@ -21350,7 +21280,7 @@ } } }, - "529:10": { + "528:10": { "preRequisites:11": [ 527, 526, @@ -21389,7 +21319,7 @@ } } }, - "530:10": { + "529:10": { "preRequisites:11": [ 527 ], @@ -21643,7 +21573,7 @@ } } }, - "531:10": { + "530:10": { "preRequisites:11": [ 529 ], @@ -21674,7 +21604,7 @@ } } }, - "532:10": { + "531:10": { "preRequisites:11": [ 531 ], @@ -21707,7 +21637,7 @@ } } }, - "533:10": { + "532:10": { "preRequisites:11": [ 531 ], @@ -21738,7 +21668,7 @@ } } }, - "534:10": { + "533:10": { "preRequisites:11": [ 533 ], @@ -21769,7 +21699,7 @@ } } }, - "535:10": { + "534:10": { "preRequisites:11": [ 518 ], @@ -21793,7 +21723,7 @@ } } }, - "536:10": { + "535:10": { "preRequisites:11": [ 31 ], @@ -21832,7 +21762,7 @@ } } }, - "537:10": { + "536:10": { "preRequisites:11": [ 243 ], @@ -21870,7 +21800,7 @@ } } }, - "538:10": { + "537:10": { "preRequisites:11": [ 537 ], @@ -21908,7 +21838,7 @@ } } }, - "539:10": { + "538:10": { "preRequisites:11": [ 540 ], @@ -21941,7 +21871,7 @@ } } }, - "540:10": { + "539:10": { "preRequisites:11": [ 531 ], @@ -21969,7 +21899,7 @@ } } }, - "541:10": { + "540:10": { "preRequisites:11": [ 540, 532 @@ -21994,7 +21924,7 @@ } } }, - "542:10": { + "541:10": { "preRequisites:11": [ 541 ], @@ -22018,7 +21948,7 @@ } } }, - "543:10": { + "542:10": { "preRequisites:11": [ 540 ], @@ -22051,7 +21981,7 @@ } } }, - "544:10": { + "543:10": { "preRequisites:11": [ 540 ], @@ -22084,7 +22014,7 @@ } } }, - "545:10": { + "544:10": { "preRequisites:11": [ 510, 243 @@ -22120,7 +22050,7 @@ } } }, - "546:10": { + "545:10": { "preRequisites:11": [ 479, 521 @@ -22167,7 +22097,7 @@ } } }, - "547:10": { + "546:10": { "preRequisites:11": [ 99 ], @@ -22200,7 +22130,7 @@ } } }, - "548:10": { + "547:10": { "preRequisites:11": [ 546 ], @@ -22233,7 +22163,7 @@ } } }, - "549:10": { + "548:10": { "preRequisites:11": [ 546, 550 @@ -22280,7 +22210,7 @@ } } }, - "550:10": { + "549:10": { "preRequisiteTypes:7": [ 0, 1 @@ -22319,7 +22249,7 @@ } } }, - "551:10": { + "550:10": { "preRequisites:11": [ 546 ], @@ -22352,7 +22282,7 @@ } } }, - "552:10": { + "551:10": { "preRequisites:11": [ 719 ], @@ -22386,7 +22316,7 @@ } } }, - "553:10": { + "552:10": { "preRequisites:11": [ 510 ], @@ -22419,7 +22349,7 @@ } } }, - "554:10": { + "553:10": { "preRequisites:11": [ 546 ], @@ -22450,7 +22380,7 @@ } } }, - "555:10": { + "554:10": { "preRequisites:11": [ 533 ], @@ -22481,7 +22411,7 @@ } } }, - "556:10": { + "555:10": { "preRequisites:11": [ 533 ], @@ -22512,7 +22442,7 @@ } } }, - "557:10": { + "556:10": { "preRequisites:11": [ 559 ], @@ -22551,7 +22481,7 @@ } } }, - "558:10": { + "557:10": { "preRequisites:11": [ 559 ], @@ -22586,7 +22516,7 @@ } } }, - "559:10": { + "558:10": { "preRequisites:11": [ 533 ], @@ -22617,7 +22547,7 @@ } } }, - "560:10": { + "559:10": { "preRequisites:11": [ 533 ], @@ -22648,7 +22578,7 @@ } } }, - "561:10": { + "560:10": { "preRequisites:11": [ 549 ], @@ -22681,7 +22611,7 @@ } } }, - "562:10": { + "561:10": { "preRequisites:11": [ 31 ], @@ -22740,7 +22670,7 @@ } } }, - "563:10": { + "562:10": { "preRequisites:11": [ 388 ], @@ -22773,7 +22703,7 @@ } } }, - "564:10": { + "563:10": { "preRequisites:11": [ 546 ], @@ -22804,7 +22734,7 @@ } } }, - "565:10": { + "564:10": { "preRequisites:11": [ 510 ], @@ -22837,7 +22767,7 @@ } } }, - "566:10": { + "565:10": { "preRequisites:11": [ 549 ], @@ -22870,7 +22800,7 @@ } } }, - "567:10": { + "566:10": { "preRequisites:11": [ 549 ], @@ -22941,7 +22871,7 @@ } } }, - "568:10": { + "567:10": { "preRequisites:11": [ 540 ], @@ -22973,7 +22903,7 @@ } } }, - "569:10": { + "568:10": { "preRequisites:11": [ 553, 565, @@ -23013,7 +22943,7 @@ } } }, - "570:10": { + "569:10": { "preRequisites:11": [ 552 ], @@ -23046,7 +22976,7 @@ } } }, - "571:10": { + "570:10": { "preRequisites:11": [ 568 ], @@ -24994,7 +24924,7 @@ } } }, - "572:10": { + "571:10": { "preRequisites:11": [ 568 ], @@ -25095,7 +25025,7 @@ } } }, - "573:10": { + "572:10": { "preRequisites:11": [ 568 ], @@ -25172,7 +25102,7 @@ } } }, - "574:10": { + "573:10": { "preRequisites:11": [ 568 ], @@ -25203,7 +25133,7 @@ } } }, - "575:10": { + "574:10": { "preRequisites:11": [ 568 ], @@ -25235,7 +25165,7 @@ } } }, - "576:10": { + "575:10": { "preRequisites:11": [ 574 ], @@ -25268,7 +25198,7 @@ } } }, - "577:10": { + "576:10": { "preRequisiteTypes:7": [ 0, 1 @@ -25306,7 +25236,7 @@ } } }, - "578:10": { + "577:10": { "preRequisites:11": [ 639, 479 @@ -25346,7 +25276,7 @@ } } }, - "579:10": { + "578:10": { "preRequisites:11": [ 154 ], @@ -25379,7 +25309,7 @@ } } }, - "580:10": { + "579:10": { "preRequisites:11": [ 31 ], @@ -25403,7 +25333,7 @@ } } }, - "581:10": { + "580:10": { "preRequisites:11": [ 546 ], @@ -25434,7 +25364,7 @@ } } }, - "582:10": { + "581:10": { "preRequisites:11": [ 546 ], @@ -25466,7 +25396,7 @@ } } }, - "583:10": { + "582:10": { "preRequisiteTypes:7": [ 0, 1 @@ -25507,7 +25437,7 @@ } } }, - "584:10": { + "583:10": { "preRequisites:11": [ 544 ], @@ -25538,7 +25468,7 @@ } } }, - "585:10": { + "584:10": { "preRequisites:11": [ 533 ], @@ -25569,7 +25499,7 @@ } } }, - "586:10": { + "585:10": { "preRequisites:11": [ 533 ], @@ -25616,7 +25546,7 @@ } } }, - "587:10": { + "586:10": { "preRequisites:11": [ 765, 199 @@ -25650,7 +25580,7 @@ } } }, - "588:10": { + "587:10": { "preRequisites:11": [ 546 ], @@ -25681,7 +25611,7 @@ } } }, - "589:10": { + "588:10": { "preRequisites:11": [ 521 ], @@ -25716,7 +25646,7 @@ } } }, - "590:10": { + "589:10": { "preRequisites:11": [ 549 ], @@ -25747,7 +25677,7 @@ } } }, - "591:10": { + "590:10": { "preRequisites:11": [ 540 ], @@ -25820,7 +25750,7 @@ } } }, - "592:10": { + "591:10": { "preRequisites:11": [ 81 ], @@ -25868,7 +25798,7 @@ } } }, - "593:10": { + "592:10": { "preRequisites:11": [ 400 ], @@ -25901,7 +25831,7 @@ } } }, - "594:10": { + "593:10": { "preRequisites:11": [ 593 ], @@ -25948,7 +25878,7 @@ } } }, - "595:10": { + "594:10": { "preRequisites:11": [ 593 ], @@ -25995,7 +25925,7 @@ } } }, - "596:10": { + "595:10": { "preRequisites:11": [ 593 ], @@ -26042,7 +25972,7 @@ } } }, - "597:10": { + "596:10": { "preRequisites:11": [ 593 ], @@ -26089,7 +26019,7 @@ } } }, - "598:10": { + "597:10": { "preRequisiteTypes:7": [ 0, 1, @@ -26129,7 +26059,7 @@ } } }, - "599:10": { + "598:10": { "preRequisites:11": [ 81 ], @@ -26182,7 +26112,7 @@ } } }, - "600:10": { + "599:10": { "preRequisites:11": [ 213, 104 @@ -26214,7 +26144,7 @@ } } }, - "601:10": { + "600:10": { "preRequisites:11": [ 51 ], @@ -26245,7 +26175,7 @@ } } }, - "602:10": { + "601:10": { "preRequisites:11": [ 124 ], @@ -26278,7 +26208,7 @@ } } }, - "603:10": { + "602:10": { "preRequisites:11": [ 36 ], @@ -26311,7 +26241,7 @@ } } }, - "604:10": { + "603:10": { "preRequisites:11": [ 109 ], @@ -26335,7 +26265,7 @@ } } }, - "605:10": { + "604:10": { "preRequisites:11": [ 602 ], @@ -26366,7 +26296,7 @@ } } }, - "606:10": { + "605:10": { "preRequisites:11": [ 602 ], @@ -26397,7 +26327,7 @@ } } }, - "607:10": { + "606:10": { "preRequisites:11": [ 101 ], @@ -26428,7 +26358,7 @@ } } }, - "608:10": { + "607:10": { "preRequisites:11": [ 230 ], @@ -26459,7 +26389,7 @@ } } }, - "609:10": { + "608:10": { "preRequisites:11": [ 31 ], @@ -26490,7 +26420,7 @@ } } }, - "610:10": { + "609:10": { "preRequisites:11": [ 222 ], @@ -26529,7 +26459,7 @@ } } }, - "611:10": { + "610:10": { "preRequisites:11": [ 593 ], @@ -26567,7 +26497,7 @@ } } }, - "612:10": { + "611:10": { "preRequisites:11": [ 611 ], @@ -26603,7 +26533,7 @@ } } }, - "613:10": { + "612:10": { "preRequisites:11": [ 611 ], @@ -26634,7 +26564,7 @@ } } }, - "614:10": { + "613:10": { "preRequisites:11": [ 623 ], @@ -26683,7 +26613,7 @@ } } }, - "615:10": { + "614:10": { "preRequisites:11": [ 618 ], @@ -26716,7 +26646,7 @@ } } }, - "616:10": { + "615:10": { "preRequisites:11": [ 615 ], @@ -26749,7 +26679,7 @@ } } }, - "617:10": { + "616:10": { "preRequisites:11": [ 616, 390 @@ -26784,7 +26714,7 @@ } } }, - "618:10": { + "617:10": { "preRequisiteTypes:7": [ 0, 1 @@ -26823,7 +26753,7 @@ } } }, - "619:10": { + "618:10": { "preRequisites:11": [ 617 ], @@ -26843,7 +26773,7 @@ "rewards:9": {}, "tasks:9": {} }, - "620:10": { + "619:10": { "preRequisites:11": [ 621, 614, @@ -26899,7 +26829,7 @@ } } }, - "621:10": { + "620:10": { "preRequisites:11": [ 398 ], @@ -26931,7 +26861,7 @@ } } }, - "622:10": { + "621:10": { "preRequisites:11": [ 614 ], @@ -26965,7 +26895,7 @@ } } }, - "623:10": { + "622:10": { "preRequisites:11": [ 479 ], @@ -26999,7 +26929,7 @@ } } }, - "624:10": { + "623:10": { "preRequisites:11": [ 622 ], @@ -27032,7 +26962,7 @@ } } }, - "625:10": { + "624:10": { "preRequisites:11": [ 624 ], @@ -27079,7 +27009,7 @@ } } }, - "626:10": { + "625:10": { "preRequisites:11": [ 624 ], @@ -27115,7 +27045,7 @@ } } }, - "627:10": { + "626:10": { "preRequisites:11": [ 624 ], @@ -27163,7 +27093,7 @@ } } }, - "628:10": { + "627:10": { "preRequisites:11": [ 624 ], @@ -27210,7 +27140,7 @@ } } }, - "629:10": { + "628:10": { "preRequisites:11": [ 624 ], @@ -27257,7 +27187,7 @@ } } }, - "630:10": { + "629:10": { "preRequisites:11": [ 624 ], @@ -27305,7 +27235,7 @@ } } }, - "631:10": { + "630:10": { "preRequisites:11": [ 191 ], @@ -27329,7 +27259,7 @@ } } }, - "632:10": { + "631:10": { "preRequisites:11": [ 622, 687 @@ -27364,7 +27294,7 @@ } } }, - "633:10": { + "632:10": { "preRequisites:11": [ 622 ], @@ -27398,7 +27328,7 @@ } } }, - "634:10": { + "633:10": { "preRequisites:11": [ 622 ], @@ -27432,7 +27362,7 @@ } } }, - "635:10": { + "634:10": { "preRequisites:11": [ 622, 698 @@ -27467,7 +27397,7 @@ } } }, - "636:10": { + "635:10": { "preRequisites:11": [ 622 ], @@ -27501,7 +27431,7 @@ } } }, - "637:10": { + "636:10": { "preRequisites:11": [ 648 ], @@ -27563,7 +27493,7 @@ } } }, - "638:10": { + "637:10": { "preRequisites:11": [ 181 ], @@ -27599,7 +27529,7 @@ } } }, - "639:10": { + "638:10": { "preRequisites:11": [ 243, 469, @@ -27642,7 +27572,7 @@ } } }, - "640:10": { + "639:10": { "preRequisites:11": [ 654 ], @@ -27673,7 +27603,7 @@ } } }, - "641:10": { + "640:10": { "preRequisites:11": [ 614 ], @@ -27712,7 +27642,7 @@ } } }, - "642:10": { + "641:10": { "preRequisites:11": [ 641 ], @@ -27752,7 +27682,7 @@ } } }, - "643:10": { + "642:10": { "preRequisites:11": [ 642 ], @@ -27791,7 +27721,7 @@ } } }, - "644:10": { + "643:10": { "preRequisites:11": [ 643, 649 @@ -27826,7 +27756,7 @@ } } }, - "645:10": { + "644:10": { "preRequisiteTypes:7": [ 0, 1 @@ -27862,7 +27792,7 @@ } } }, - "646:10": { + "645:10": { "preRequisites:11": [ 51 ], @@ -27901,7 +27831,7 @@ } } }, - "647:10": { + "646:10": { "preRequisites:11": [ 614 ], @@ -27944,7 +27874,7 @@ } } }, - "648:10": { + "647:10": { "preRequisiteTypes:7": [ 0, 2 @@ -27989,7 +27919,7 @@ } } }, - "649:10": { + "648:10": { "preRequisites:11": [ 648 ], @@ -28022,7 +27952,7 @@ } } }, - "650:10": { + "649:10": { "preRequisites:11": [ 213 ], @@ -28045,7 +27975,7 @@ } } }, - "651:10": { + "650:10": { "preRequisites:11": [ 510 ], @@ -28084,7 +28014,7 @@ } } }, - "652:10": { + "651:10": { "preRequisites:11": [ 188 ], @@ -28122,7 +28052,7 @@ } } }, - "653:10": { + "652:10": { "preRequisiteTypes:7": [ 1 ], @@ -28159,7 +28089,7 @@ } } }, - "654:10": { + "653:10": { "preRequisites:11": [ 398 ], @@ -28180,7 +28110,7 @@ "rewards:9": {}, "tasks:9": {} }, - "655:10": { + "654:10": { "preRequisiteTypes:7": [ 0, 1 @@ -28208,7 +28138,7 @@ } } }, - "656:10": { + "655:10": { "preRequisites:11": [ 441, 18 @@ -28242,7 +28172,7 @@ } } }, - "657:10": { + "656:10": { "preRequisites:11": [ 388 ], @@ -28267,7 +28197,7 @@ } } }, - "658:10": { + "657:10": { "preRequisites:11": [ 104 ], @@ -28291,7 +28221,7 @@ } } }, - "659:10": { + "658:10": { "preRequisites:11": [ 181 ], @@ -28318,7 +28248,7 @@ } } }, - "660:10": { + "659:10": { "preRequisites:11": [ 604 ], @@ -28343,7 +28273,7 @@ } } }, - "661:10": { + "660:10": { "preRequisites:11": [ 188 ], @@ -28371,7 +28301,7 @@ } } }, - "662:10": { + "661:10": { "preRequisites:11": [ 672, 882 @@ -28406,7 +28336,7 @@ } } }, - "663:10": { + "662:10": { "preRequisites:11": [ 243 ], @@ -28439,7 +28369,7 @@ } } }, - "664:10": { + "663:10": { "preRequisites:11": [ 125 ], @@ -28463,7 +28393,7 @@ } } }, - "665:10": { + "664:10": { "preRequisiteTypes:7": [ 0, 0, @@ -28508,7 +28438,7 @@ } } }, - "666:10": { + "665:10": { "preRequisites:11": [ 104 ], @@ -28535,7 +28465,7 @@ } } }, - "667:10": { + "666:10": { "preRequisites:11": [ 104 ], @@ -30474,7 +30404,7 @@ } } }, - "668:10": { + "667:10": { "preRequisites:11": [ 48 ], @@ -30491,7 +30421,7 @@ "Durability:3": 0, "HarvestLevel:3": 1, "Material:8": "rubber", - "MaxDurability:3": 256, + "MaxDurability:3": 255, "ToolSpeed:5": 4.0 }, "HideFlags:3": 2 @@ -30531,7 +30461,7 @@ } } }, - "669:10": { + "668:10": { "preRequisites:11": [ 763 ], @@ -30568,7 +30498,7 @@ } } }, - "670:10": { + "669:10": { "preRequisiteTypes:7": [ 1 ], @@ -30602,7 +30532,7 @@ } } }, - "671:10": { + "670:10": { "preRequisites:11": [ 81 ], @@ -30640,7 +30570,7 @@ } } }, - "672:10": { + "671:10": { "preRequisites:11": [ 663, 674, @@ -30690,7 +30620,7 @@ } } }, - "673:10": { + "672:10": { "preRequisites:11": [ 390 ], @@ -30713,7 +30643,7 @@ } } }, - "674:10": { + "673:10": { "preRequisites:11": [ 243 ], @@ -30746,7 +30676,7 @@ } } }, - "675:10": { + "674:10": { "preRequisites:11": [ 673 ], @@ -30784,7 +30714,7 @@ } } }, - "676:10": { + "675:10": { "preRequisites:11": [ 675, 678 @@ -30819,7 +30749,7 @@ } } }, - "677:10": { + "676:10": { "preRequisites:11": [ 673 ], @@ -30857,7 +30787,7 @@ } } }, - "678:10": { + "677:10": { "preRequisites:11": [ 479 ], @@ -30890,7 +30820,7 @@ } } }, - "679:10": { + "678:10": { "preRequisites:11": [ 479, 708 @@ -30926,7 +30856,7 @@ } } }, - "680:10": { + "679:10": { "preRequisites:11": [ 644 ], @@ -30965,7 +30895,7 @@ } } }, - "681:10": { + "680:10": { "preRequisites:11": [ 645 ], @@ -30996,7 +30926,7 @@ } } }, - "682:10": { + "681:10": { "preRequisites:11": [ 377 ], @@ -31020,7 +30950,7 @@ } } }, - "683:10": { + "682:10": { "preRequisites:11": [ 104 ], @@ -31068,7 +30998,7 @@ } } }, - "684:10": { + "683:10": { "preRequisites:11": [ 240 ], @@ -31099,7 +31029,7 @@ } } }, - "685:10": { + "684:10": { "preRequisites:11": [ 169 ], @@ -31126,7 +31056,7 @@ } } }, - "686:10": { + "685:10": { "preRequisites:11": [ 374, 787 @@ -31150,7 +31080,7 @@ } } }, - "687:10": { + "686:10": { "preRequisites:11": [ 620 ], @@ -31183,7 +31113,7 @@ } } }, - "688:10": { + "687:10": { "preRequisites:11": [ 641, 466 @@ -31217,7 +31147,7 @@ } } }, - "689:10": { + "688:10": { "preRequisites:11": [ 641 ], @@ -31244,7 +31174,7 @@ } } }, - "690:10": { + "689:10": { "preRequisites:11": [ 647 ], @@ -31277,7 +31207,7 @@ } } }, - "691:10": { + "690:10": { "preRequisites:11": [ 688, 683 @@ -31311,7 +31241,7 @@ } } }, - "692:10": { + "691:10": { "preRequisites:11": [ 614, 693 @@ -31345,7 +31275,7 @@ } } }, - "693:10": { + "692:10": { "preRequisiteTypes:7": [ 0, 1 @@ -31383,7 +31313,7 @@ } } }, - "694:10": { + "693:10": { "preRequisites:11": [ 692, 695 @@ -31425,7 +31355,7 @@ } } }, - "695:10": { + "694:10": { "preRequisites:11": [ 479 ], @@ -31458,7 +31388,7 @@ } } }, - "696:10": { + "695:10": { "preRequisites:11": [ 692 ], @@ -31492,7 +31422,7 @@ } } }, - "697:10": { + "696:10": { "preRequisites:11": [ 172 ], @@ -31525,7 +31455,7 @@ } } }, - "698:10": { + "697:10": { "preRequisites:11": [ 620, 451 @@ -31559,7 +31489,7 @@ } } }, - "699:10": { + "698:10": { "preRequisites:11": [ 700, 701, @@ -31595,7 +31525,7 @@ } } }, - "700:10": { + "699:10": { "preRequisites:11": [ 243 ], @@ -31628,7 +31558,7 @@ } } }, - "701:10": { + "700:10": { "preRequisiteTypes:7": [ 1 ], @@ -31668,7 +31598,7 @@ } } }, - "702:10": { + "701:10": { "preRequisites:11": [ 776, 699 @@ -31702,7 +31632,7 @@ } } }, - "703:10": { + "702:10": { "preRequisites:11": [ 702, 497 @@ -31737,7 +31667,7 @@ } } }, - "704:10": { + "703:10": { "preRequisites:11": [ 703 ], @@ -31771,7 +31701,7 @@ } } }, - "705:10": { + "704:10": { "preRequisites:11": [ 703 ], @@ -31814,7 +31744,7 @@ } } }, - "706:10": { + "705:10": { "preRequisites:11": [ 679 ], @@ -31848,7 +31778,7 @@ } } }, - "707:10": { + "706:10": { "preRequisites:11": [ 708 ], @@ -31882,7 +31812,7 @@ } } }, - "708:10": { + "707:10": { "preRequisites:11": [ 709 ], @@ -31916,7 +31846,7 @@ } } }, - "709:10": { + "708:10": { "preRequisites:11": [ 614 ], @@ -31970,7 +31900,7 @@ } } }, - "710:10": { + "709:10": { "preRequisites:11": [ 644 ], @@ -32004,7 +31934,7 @@ } } }, - "711:10": { + "710:10": { "preRequisites:11": [ 66 ], @@ -32035,7 +31965,7 @@ } } }, - "712:10": { + "711:10": { "preRequisites:11": [ 101 ], @@ -32070,7 +32000,7 @@ } } }, - "713:10": { + "712:10": { "preRequisites:11": [ 641 ], @@ -32098,7 +32028,7 @@ } } }, - "714:10": { + "713:10": { "preRequisites:11": [ 647 ], @@ -32132,7 +32062,7 @@ } } }, - "715:10": { + "714:10": { "preRequisites:11": [ 647 ], @@ -32165,7 +32095,7 @@ } } }, - "716:10": { + "715:10": { "preRequisites:11": [ 710 ], @@ -32198,7 +32128,7 @@ } } }, - "717:10": { + "716:10": { "preRequisites:11": [ 706 ], @@ -32231,7 +32161,7 @@ } } }, - "718:10": { + "717:10": { "preRequisites:11": [ 479, 394, @@ -32262,7 +32192,7 @@ } } }, - "719:10": { + "718:10": { "preRequisites:11": [ 104, 545 @@ -32312,7 +32242,7 @@ } } }, - "720:10": { + "719:10": { "preRequisites:11": [ 637 ], @@ -32335,7 +32265,7 @@ } } }, - "721:10": { + "720:10": { "preRequisites:11": [ 101 ], @@ -32366,7 +32296,7 @@ } } }, - "722:10": { + "721:10": { "preRequisites:11": [ 25 ], @@ -32409,7 +32339,7 @@ } } }, - "723:10": { + "722:10": { "preRequisites:11": [ 25 ], @@ -32452,7 +32382,7 @@ } } }, - "724:10": { + "723:10": { "preRequisites:11": [ 25 ], @@ -32492,7 +32422,7 @@ } } }, - "725:10": { + "724:10": { "preRequisites:11": [ 191 ], @@ -32527,7 +32457,7 @@ } } }, - "726:10": { + "725:10": { "preRequisites:11": [ 538 ], @@ -32565,7 +32495,7 @@ } } }, - "727:10": { + "726:10": { "preRequisites:11": [ 728, 726 @@ -32599,7 +32529,7 @@ } } }, - "728:10": { + "727:10": { "preRequisites:11": [ 729, 411 @@ -32638,7 +32568,7 @@ } } }, - "729:10": { + "728:10": { "preRequisites:11": [ 203 ], @@ -32671,7 +32601,7 @@ } } }, - "730:10": { + "729:10": { "preRequisites:11": [ 727 ], @@ -32704,7 +32634,7 @@ } } }, - "731:10": { + "730:10": { "preRequisites:11": [ 730 ], @@ -32748,7 +32678,7 @@ } } }, - "732:10": { + "731:10": { "preRequisites:11": [ 733 ], @@ -32792,7 +32722,7 @@ } } }, - "733:10": { + "732:10": { "preRequisites:11": [ 730 ], @@ -32836,7 +32766,7 @@ } } }, - "734:10": { + "733:10": { "preRequisites:11": [ 30 ], @@ -32867,7 +32797,7 @@ } } }, - "735:10": { + "734:10": { "preRequisites:11": [ 398 ], @@ -32900,7 +32830,7 @@ } } }, - "736:10": { + "735:10": { "preRequisites:11": [ 735 ], @@ -32919,7 +32849,7 @@ "rewards:9": {}, "tasks:9": {} }, - "737:10": { + "736:10": { "preRequisites:11": [ 66 ], @@ -32967,7 +32897,7 @@ } } }, - "738:10": { + "737:10": { "preRequisites:11": [ 30 ], @@ -33000,7 +32930,7 @@ } } }, - "739:10": { + "738:10": { "preRequisiteTypes:7": [ 2, 0 @@ -33025,7 +32955,7 @@ "rewards:9": {}, "tasks:9": {} }, - "740:10": { + "739:10": { "preRequisites:11": [ 222 ], @@ -33065,7 +32995,7 @@ } } }, - "741:10": { + "740:10": { "preRequisites:11": [ 497 ], @@ -33108,7 +33038,7 @@ } } }, - "742:10": { + "741:10": { "preRequisites:11": [ 101, 465 @@ -33146,7 +33076,7 @@ } } }, - "743:10": { + "742:10": { "preRequisites:11": [ 742 ], @@ -33174,7 +33104,7 @@ } } }, - "744:10": { + "743:10": { "preRequisites:11": [ 743 ], @@ -33221,7 +33151,7 @@ } } }, - "745:10": { + "744:10": { "preRequisites:11": [ 30 ], @@ -33264,7 +33194,7 @@ } } }, - "746:10": { + "745:10": { "preRequisites:11": [ 743 ], @@ -33294,7 +33224,7 @@ } } }, - "747:10": { + "746:10": { "preRequisiteTypes:7": [ 0, 1 @@ -33326,7 +33256,7 @@ } } }, - "748:10": { + "747:10": { "preRequisites:11": [ 743 ], @@ -33354,7 +33284,7 @@ } } }, - "749:10": { + "748:10": { "preRequisites:11": [ 743 ], @@ -33385,7 +33315,7 @@ } } }, - "750:10": { + "749:10": { "preRequisites:11": [ 746 ], @@ -33419,7 +33349,7 @@ } } }, - "751:10": { + "750:10": { "preRequisites:11": [ 688, 719 @@ -33453,7 +33383,7 @@ } } }, - "752:10": { + "751:10": { "preRequisites:11": [ 41 ], @@ -33500,7 +33430,7 @@ } } }, - "753:10": { + "752:10": { "preRequisites:11": [ 700 ], @@ -33534,7 +33464,7 @@ } } }, - "754:10": { + "753:10": { "preRequisites:11": [ 550 ], @@ -33567,7 +33497,7 @@ } } }, - "755:10": { + "754:10": { "preRequisites:11": [ 550 ], @@ -33600,7 +33530,7 @@ } } }, - "756:10": { + "755:10": { "preRequisites:11": [ 755, 821 @@ -33634,7 +33564,7 @@ } } }, - "757:10": { + "756:10": { "preRequisites:11": [ 754 ], @@ -33682,7 +33612,7 @@ } } }, - "758:10": { + "757:10": { "preRequisites:11": [ 757 ], @@ -33715,7 +33645,7 @@ } } }, - "759:10": { + "758:10": { "preRequisites:11": [ 758 ], @@ -33762,7 +33692,7 @@ } } }, - "760:10": { + "759:10": { "preRequisites:11": [ 758 ], @@ -33809,7 +33739,7 @@ } } }, - "761:10": { + "760:10": { "preRequisites:11": [ 758 ], @@ -33856,7 +33786,7 @@ } } }, - "762:10": { + "761:10": { "preRequisites:11": [ 758 ], @@ -33903,7 +33833,7 @@ } } }, - "763:10": { + "762:10": { "preRequisites:11": [ 20 ], @@ -33930,7 +33860,7 @@ } } }, - "764:10": { + "763:10": { "preRequisites:11": [ 651 ], @@ -33968,7 +33898,7 @@ } } }, - "765:10": { + "764:10": { "preRequisites:11": [ 687, 770 @@ -34002,7 +33932,7 @@ } } }, - "766:10": { + "765:10": { "preRequisites:11": [ 587 ], @@ -34035,7 +33965,7 @@ } } }, - "767:10": { + "766:10": { "preRequisites:11": [ 766, 701, @@ -34070,7 +34000,7 @@ } } }, - "768:10": { + "767:10": { "preRequisites:11": [ 767 ], @@ -34103,7 +34033,7 @@ } } }, - "769:10": { + "768:10": { "preRequisites:11": [ 768 ], @@ -34136,7 +34066,7 @@ } } }, - "770:10": { + "769:10": { "preRequisites:11": [ 719 ], @@ -34169,7 +34099,7 @@ } } }, - "771:10": { + "770:10": { "preRequisites:11": [ 699 ], @@ -34202,7 +34132,7 @@ } } }, - "772:10": { + "771:10": { "preRequisites:11": [ 771 ], @@ -34235,7 +34165,7 @@ } } }, - "773:10": { + "772:10": { "preRequisites:11": [ 777 ], @@ -34281,7 +34211,7 @@ } } }, - "774:10": { + "773:10": { "preRequisites:11": [ 780 ], @@ -34314,7 +34244,7 @@ } } }, - "775:10": { + "774:10": { "preRequisites:11": [ 788, 169 @@ -34342,7 +34272,7 @@ } } }, - "776:10": { + "775:10": { "preRequisites:11": [ 778 ], @@ -34375,7 +34305,7 @@ } } }, - "777:10": { + "776:10": { "preRequisites:11": [ 779 ], @@ -34408,7 +34338,7 @@ } } }, - "778:10": { + "777:10": { "preRequisites:11": [ 777 ], @@ -34454,7 +34384,7 @@ } } }, - "779:10": { + "778:10": { "preRequisites:11": [ 772 ], @@ -34487,7 +34417,7 @@ } } }, - "780:10": { + "779:10": { "preRequisites:11": [ 773 ], @@ -34520,7 +34450,7 @@ } } }, - "781:10": { + "780:10": { "preRequisites:11": [ 31, 580 @@ -34544,7 +34474,7 @@ } } }, - "782:10": { + "781:10": { "preRequisites:11": [ 781 ], @@ -34571,7 +34501,7 @@ } } }, - "783:10": { + "782:10": { "preRequisites:11": [ 781 ], @@ -34604,7 +34534,7 @@ } } }, - "784:10": { + "783:10": { "preRequisites:11": [ 31, 787 @@ -34625,7 +34555,7 @@ "rewards:9": {}, "tasks:9": {} }, - "785:10": { + "784:10": { "preRequisites:11": [ 804 ], @@ -34664,7 +34594,7 @@ } } }, - "786:10": { + "785:10": { "preRequisites:11": [ 580 ], @@ -34689,7 +34619,7 @@ } } }, - "787:10": { + "786:10": { "preRequisites:11": [ 580 ], @@ -34713,7 +34643,7 @@ } } }, - "788:10": { + "787:10": { "preRequisites:11": [ 580 ], @@ -34737,7 +34667,7 @@ } } }, - "789:10": { + "788:10": { "preRequisites:11": [ 31, 781 @@ -34771,7 +34701,7 @@ } } }, - "790:10": { + "789:10": { "preRequisites:11": [ 786, 373 @@ -34810,7 +34740,7 @@ } } }, - "791:10": { + "790:10": { "preRequisites:11": [ 775, 394 @@ -34834,7 +34764,7 @@ "rewards:9": {}, "tasks:9": {} }, - "792:10": { + "791:10": { "preRequisites:11": [ 756 ], @@ -34866,7 +34796,7 @@ } } }, - "793:10": { + "792:10": { "preRequisites:11": [ 550 ], @@ -34908,7 +34838,7 @@ } } }, - "794:10": { + "793:10": { "preRequisites:11": [ 793 ], @@ -34955,7 +34885,7 @@ } } }, - "795:10": { + "794:10": { "preRequisites:11": [ 794, 796 @@ -34989,7 +34919,7 @@ } } }, - "796:10": { + "795:10": { "preRequisites:11": [ 648 ], @@ -35028,7 +34958,7 @@ } } }, - "797:10": { + "796:10": { "preRequisites:11": [ 795 ], @@ -35061,7 +34991,7 @@ } } }, - "798:10": { + "797:10": { "preRequisites:11": [ 797 ], @@ -35095,7 +35025,7 @@ } } }, - "799:10": { + "798:10": { "preRequisites:11": [ 637 ], @@ -35128,7 +35058,7 @@ } } }, - "800:10": { + "799:10": { "preRequisites:11": [ 795, 799 @@ -35163,7 +35093,7 @@ } } }, - "801:10": { + "800:10": { "preRequisites:11": [ 800 ], @@ -35196,7 +35126,7 @@ } } }, - "802:10": { + "801:10": { "preRequisiteTypes:7": [ 0, 1 @@ -35245,7 +35175,7 @@ } } }, - "803:10": { + "802:10": { "preRequisites:11": [ 802 ], @@ -35278,7 +35208,7 @@ } } }, - "804:10": { + "803:10": { "preRequisites:11": [ 550 ], @@ -35317,7 +35247,7 @@ } } }, - "805:10": { + "804:10": { "preRequisites:11": [ 785, 793 @@ -35379,7 +35309,7 @@ } } }, - "806:10": { + "805:10": { "preRequisites:11": [ 805 ], @@ -35422,7 +35352,7 @@ } } }, - "807:10": { + "806:10": { "preRequisites:11": [ 805 ], @@ -35455,7 +35385,7 @@ } } }, - "808:10": { + "807:10": { "preRequisites:11": [ 807 ], @@ -35495,7 +35425,7 @@ } } }, - "809:10": { + "808:10": { "preRequisites:11": [ 811 ], @@ -35528,7 +35458,7 @@ } } }, - "810:10": { + "809:10": { "preRequisites:11": [ 812 ], @@ -35561,7 +35491,7 @@ } } }, - "811:10": { + "810:10": { "preRequisites:11": [ 808, 806 @@ -35596,7 +35526,7 @@ } } }, - "812:10": { + "811:10": { "preRequisites:11": [ 806, 808 @@ -35631,7 +35561,7 @@ } } }, - "813:10": { + "812:10": { "preRequisites:11": [ 809, 810, @@ -35661,7 +35591,7 @@ } } }, - "814:10": { + "813:10": { "preRequisites:11": [ 793 ], @@ -35694,7 +35624,7 @@ } } }, - "815:10": { + "814:10": { "preRequisites:11": [ 816 ], @@ -35727,7 +35657,7 @@ } } }, - "816:10": { + "815:10": { "preRequisites:11": [ 820 ], @@ -35766,7 +35696,7 @@ } } }, - "817:10": { + "816:10": { "preRequisites:11": [ 820 ], @@ -35799,7 +35729,7 @@ } } }, - "818:10": { + "817:10": { "preRequisites:11": [ 814 ], @@ -35838,7 +35768,7 @@ } } }, - "819:10": { + "818:10": { "preRequisites:11": [ 817 ], @@ -35871,7 +35801,7 @@ } } }, - "820:10": { + "819:10": { "preRequisites:11": [ 818 ], @@ -35914,7 +35844,7 @@ } } }, - "821:10": { + "820:10": { "preRequisites:11": [ 92 ], @@ -35947,7 +35877,7 @@ } } }, - "822:10": { + "821:10": { "preRequisites:11": [ 757 ], @@ -35995,7 +35925,7 @@ } } }, - "823:10": { + "822:10": { "preRequisites:11": [ 822 ], @@ -36033,7 +35963,7 @@ } } }, - "824:10": { + "823:10": { "preRequisites:11": [ 823 ], @@ -36066,7 +35996,7 @@ } } }, - "825:10": { + "824:10": { "preRequisites:11": [ 828 ], @@ -36099,7 +36029,7 @@ } } }, - "826:10": { + "825:10": { "preRequisites:11": [ 824 ], @@ -36135,7 +36065,7 @@ } } }, - "827:10": { + "826:10": { "preRequisites:11": [ 828 ], @@ -36168,7 +36098,7 @@ } } }, - "828:10": { + "827:10": { "preRequisites:11": [ 826 ], @@ -36201,7 +36131,7 @@ } } }, - "829:10": { + "828:10": { "preRequisites:11": [ 793 ], @@ -36234,7 +36164,7 @@ } } }, - "830:10": { + "829:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36261,7 +36191,7 @@ "rewards:9": {}, "tasks:9": {} }, - "831:10": { + "830:10": { "preRequisiteTypes:7": [ 2, 2, @@ -36287,7 +36217,7 @@ "rewards:9": {}, "tasks:9": {} }, - "832:10": { + "831:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36314,7 +36244,7 @@ "rewards:9": {}, "tasks:9": {} }, - "833:10": { + "832:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36341,7 +36271,7 @@ "rewards:9": {}, "tasks:9": {} }, - "834:10": { + "833:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36367,7 +36297,7 @@ "rewards:9": {}, "tasks:9": {} }, - "835:10": { + "834:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36394,7 +36324,7 @@ "rewards:9": {}, "tasks:9": {} }, - "836:10": { + "835:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36420,7 +36350,7 @@ "rewards:9": {}, "tasks:9": {} }, - "837:10": { + "836:10": { "preRequisites:11": [ 835 ], @@ -36440,7 +36370,7 @@ "rewards:9": {}, "tasks:9": {} }, - "838:10": { + "837:10": { "preRequisites:11": [ 835 ], @@ -36460,7 +36390,7 @@ "rewards:9": {}, "tasks:9": {} }, - "839:10": { + "838:10": { "preRequisites:11": [ 835 ], @@ -36480,7 +36410,7 @@ "rewards:9": {}, "tasks:9": {} }, - "840:10": { + "839:10": { "preRequisites:11": [ 835 ], @@ -36499,7 +36429,7 @@ "rewards:9": {}, "tasks:9": {} }, - "841:10": { + "840:10": { "preRequisites:11": [ 832 ], @@ -36519,7 +36449,7 @@ "rewards:9": {}, "tasks:9": {} }, - "842:10": { + "841:10": { "preRequisites:11": [ 832 ], @@ -36538,7 +36468,7 @@ "rewards:9": {}, "tasks:9": {} }, - "843:10": { + "842:10": { "preRequisites:11": [ 832 ], @@ -36558,7 +36488,7 @@ "rewards:9": {}, "tasks:9": {} }, - "844:10": { + "843:10": { "preRequisites:11": [ 832 ], @@ -36578,7 +36508,7 @@ "rewards:9": {}, "tasks:9": {} }, - "845:10": { + "844:10": { "preRequisites:11": [ 834 ], @@ -36597,7 +36527,7 @@ "rewards:9": {}, "tasks:9": {} }, - "846:10": { + "845:10": { "preRequisites:11": [ 834 ], @@ -36616,7 +36546,7 @@ "rewards:9": {}, "tasks:9": {} }, - "847:10": { + "846:10": { "preRequisites:11": [ 834 ], @@ -36636,7 +36566,7 @@ "rewards:9": {}, "tasks:9": {} }, - "848:10": { + "847:10": { "preRequisites:11": [ 834 ], @@ -36656,7 +36586,7 @@ "rewards:9": {}, "tasks:9": {} }, - "849:10": { + "848:10": { "preRequisites:11": [ 836 ], @@ -36675,7 +36605,7 @@ "rewards:9": {}, "tasks:9": {} }, - "850:10": { + "849:10": { "preRequisites:11": [ 833 ], @@ -36695,7 +36625,7 @@ "rewards:9": {}, "tasks:9": {} }, - "851:10": { + "850:10": { "preRequisites:11": [ 98 ], @@ -36723,7 +36653,7 @@ } } }, - "852:10": { + "851:10": { "preRequisites:11": [ 98 ], @@ -36743,7 +36673,7 @@ "rewards:9": {}, "tasks:9": {} }, - "853:10": { + "852:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36770,7 +36700,7 @@ "rewards:9": {}, "tasks:9": {} }, - "854:10": { + "853:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36797,7 +36727,7 @@ "rewards:9": {}, "tasks:9": {} }, - "855:10": { + "854:10": { "preRequisiteTypes:7": [ 0, 2, @@ -36823,7 +36753,7 @@ "rewards:9": {}, "tasks:9": {} }, - "856:10": { + "855:10": { "preRequisites:11": [ 832 ], @@ -36843,7 +36773,7 @@ "rewards:9": {}, "tasks:9": {} }, - "857:10": { + "856:10": { "preRequisites:11": [ 832 ], @@ -36863,7 +36793,7 @@ "rewards:9": {}, "tasks:9": {} }, - "858:10": { + "857:10": { "preRequisites:11": [ 832 ], @@ -36882,7 +36812,7 @@ "rewards:9": {}, "tasks:9": {} }, - "859:10": { + "858:10": { "preRequisites:11": [ 834 ], @@ -36902,7 +36832,7 @@ "rewards:9": {}, "tasks:9": {} }, - "860:10": { + "859:10": { "preRequisites:11": [ 30 ], @@ -36945,7 +36875,7 @@ } } }, - "861:10": { + "860:10": { "preRequisites:11": [ 30 ], @@ -36978,7 +36908,7 @@ } } }, - "862:10": { + "861:10": { "preRequisites:11": [ 7 ], @@ -37015,7 +36945,7 @@ } } }, - "863:10": { + "862:10": { "preRequisiteTypes:7": [ 1 ], @@ -37051,7 +36981,7 @@ } } }, - "864:10": { + "863:10": { "preRequisiteTypes:7": [ 0, 1 @@ -37103,7 +37033,7 @@ } } }, - "865:10": { + "864:10": { "preRequisites:11": [ 864 ], @@ -37138,7 +37068,7 @@ } } }, - "866:10": { + "865:10": { "preRequisites:11": [ 868, 872 @@ -37173,7 +37103,7 @@ } } }, - "867:10": { + "866:10": { "preRequisiteTypes:7": [ 1, 1, @@ -37213,7 +37143,7 @@ } } }, - "868:10": { + "867:10": { "preRequisites:11": [ 867, 863, @@ -37254,7 +37184,7 @@ } } }, - "869:10": { + "868:10": { "preRequisiteTypes:7": [ 0, 1, @@ -37299,7 +37229,7 @@ } } }, - "870:10": { + "869:10": { "preRequisites:11": [ 454 ], @@ -37337,7 +37267,7 @@ } } }, - "871:10": { + "870:10": { "preRequisites:11": [ 870 ], @@ -37379,7 +37309,7 @@ } } }, - "872:10": { + "871:10": { "preRequisites:11": [ 865, 864, @@ -37414,7 +37344,7 @@ } } }, - "873:10": { + "872:10": { "preRequisites:11": [ 870 ], @@ -37437,7 +37367,7 @@ "rewards:9": {}, "tasks:9": {} }, - "874:10": { + "873:10": { "preRequisites:11": [ 791 ], @@ -37465,7 +37395,7 @@ } } }, - "875:10": { + "874:10": { "preRequisites:11": [ 550 ], @@ -37486,7 +37416,7 @@ "rewards:9": {}, "tasks:9": {} }, - "876:10": { + "875:10": { "preRequisites:11": [ 875 ], @@ -37506,7 +37436,7 @@ "rewards:9": {}, "tasks:9": {} }, - "877:10": { + "876:10": { "preRequisites:11": [ 880 ], @@ -37540,7 +37470,7 @@ } } }, - "878:10": { + "877:10": { "preRequisites:11": [ 876, 879, @@ -37563,7 +37493,7 @@ "rewards:9": {}, "tasks:9": {} }, - "879:10": { + "878:10": { "preRequisites:11": [ 550 ], @@ -37596,7 +37526,7 @@ } } }, - "880:10": { + "879:10": { "preRequisites:11": [ 404, 881 @@ -37631,7 +37561,7 @@ } } }, - "881:10": { + "880:10": { "preRequisites:11": [ 199 ], @@ -37669,7 +37599,7 @@ } } }, - "882:10": { + "881:10": { "preRequisites:11": [ 673 ], @@ -37707,7 +37637,7 @@ } } }, - "883:10": { + "882:10": { "preRequisites:11": [ 99, 222 @@ -37741,7 +37671,7 @@ } } }, - "884:10": { + "883:10": { "preRequisites:11": [ 883, 742, @@ -40109,8 +40039,8 @@ "id:3": 498, "sizeX:3": 36, "sizeY:3": 36, - "x:3": 186, - "y:3": -168 + "x:3": -36, + "y:3": -222 }, "76:10": { "id:3": 499, @@ -40375,8 +40305,8 @@ "id:3": 653, "sizeX:3": 24, "sizeY:3": 24, - "x:3": 234, - "y:3": -162 + "x:3": -30, + "y:3": -258 }, "114:10": { "id:3": 654, diff --git a/config/betterquesting/resources/supersymmetry/lang/en_us.lang b/config/betterquesting/resources/supersymmetry/lang/en_us.lang index 9dd9949e4..c2dd8d596 100644 --- a/config/betterquesting/resources/supersymmetry/lang/en_us.lang +++ b/config/betterquesting/resources/supersymmetry/lang/en_us.lang @@ -819,7 +819,7 @@ susy.quest.db.380.desc=The§6 Large Weapons Factory§r is a machine that assembl susy.quest.db.381.title=Coal Tar susy.quest.db.381.desc=§6§6Coal Tar §rcan be distilled from §6Coal§r,§r §e§2§3§4§6§6§8§6Charcoal §rand §6Anthracite§r in a §6§cPyrolyse Oven§r. §7§6Coal Tar§6§r can be distilled into §6Anthracene Oi§6§r§6l§r, §6Naphthalene Oil§r, §6Light Oil§r, and §6Creosote§r. §6Light Oil§r will be your early-game source of §6Benzene§r and §6Toluene§r. Check §eJEI§r for more infomation on how to get §6Toluene§r from §6Light Oil§r. susy.quest.db.382.title=Trolling Plan, Phase One -susy.quest.db.382.desc=Combine §6Paper§r, String and §6TNT §rin a Forming Press to create §cdynamite§r. +susy.quest.db.382.desc=Combine §6Paper§r, String and §6Liquid Glyceryl Trinitrate §rin a Forming Press to create §cdynamite§r. susy.quest.db.383.title=Trolling Plan, Phase Three susy.quest.db.383.desc=§cMissiles§r are made in a §cLarge Weapons Factory§r using several§6 Aluminium §o§o§rparts, any type of §7§6explosive§r, either §6Saltpeter or Ammonium Nitrate §rdust, and either §6Aluminium, Beryllium, Sugar or Gunpowder§r. %n%nTo complete this quest, make the §6Conventional Missile§r. susy.quest.db.384.title=Condensed Explosives @@ -864,8 +864,8 @@ susy.quest.db.403.title=Distilled Water susy.quest.db.403.desc=§bDistilled Water §rcan be obtained by §cdistilling §rWater. susy.quest.db.404.title=Raw Silicon Wafer susy.quest.db.404.desc=§6Monocrystalline Silicon Boules§r need to be cut into §6Raw Wafers §rbefore being able to be processed. The §6Raw Wafer§r can not be used to make circuit right away, however. -susy.quest.db.405.title=MV Cutting Saw -susy.quest.db.405.desc=A §6Cutting Saw §rcan use Water or Lubricant to cut items. It's required for making silicon wafers out of boules. +susy.quest.db.405.title=MV Cutting Machine +susy.quest.db.405.desc=A §6Cutting Machine §rcan use Water or Lubricant to cut items. It's required for making silicon wafers out of boules. susy.quest.db.406.title=Trolling Plan: Phase Four susy.quest.db.406.desc=Now that you are at MV, you can make more advanced types of §cexplosives §rand §cmissiles §rby putting MV power on a Weapons Factory.%n%nThere are 3 new types of explosives:%n§7Breaching explosives§r, made with steel%n§3Thermobaric explosives§r, made with ethylene oxide%n§aContagious explosives§r, made with biomass%n%nYou can get most of the ingredients for these at MV.%nRemember that these are Tier 2 missiles, so you will need a T2 missile launching station for them to work.%n%nThe range of this launcher is 1,000 meters. susy.quest.db.407.title=Glycerol @@ -1824,7 +1824,3 @@ susy.quest.db.883.title=Monorail Tracks susy.quest.db.883.desc=If you want to stick to the $6Black Mesa$r inspired style of railroading, you will require §6monorail track segments§r. They are also required in the §6tunnel bore§r. susy.quest.db.884.title=The Tunnel Bore susy.quest.db.884.desc=In conjuction with improved logistics, trains also allow you to unleash the glory of tunnel boring onto the very rock you are standing on. Building the tunnelbore requires a hefty amount of resources. In return, it allows you to rapidly excavate giant areas and automatically connect distant places with monorail tracks.%n%nIn order to power the tunnel bore, you need to supply charged batteries. Additionally, you must manufacture monorail tracks that you can put into the specificied slots. Lastly, if you want the tunnel bore to automatically bridge over any hole it encounters, you must supply it with concrete in the main area of the inventory.%n%nOnce this is done, it is just a matter of increasing the tunnelbores throttle and enjoying the glory of digging away at the mountains. -susy.quest.db.883.title=Monorail Tracks -susy.quest.db.883.desc=If you want to stick to the $6Black Mesa$r inspired style of railroading, you will require §6monorail track segments§r. They are also required in the §6tunnel bore§r. -susy.quest.db.884.title=The Tunnel Bore -susy.quest.db.884.desc=In conjuction with improved logistics, trains also allow you to unleash the glory of tunnel boring onto the very rock you are standing on. Building the tunnelbore requires a hefty amount of resources. In return, it allows you to rapidly excavate giant areas and automatically connect distant places with monorail tracks.%n%nIn order to power the tunnel bore, you need to supply charged batteries. Additionally, you must manufacture monorail tracks that you can put into the specificied slots. Lastly, if you want the tunnel bore to automatically bridge over any hole it encounters, you must supply it with concrete in the main area of the inventory.%n%nOnce this is done, it is just a matter of increasing the tunnelbores throttle and enjoying the glory of digging away at the mountains. \ No newline at end of file diff --git a/groovy/classes/ChangeFlags.groovy b/groovy/classes/ChangeFlags.groovy index c1cb12ff3..4864fe4fa 100644 --- a/groovy/classes/ChangeFlags.groovy +++ b/groovy/classes/ChangeFlags.groovy @@ -1,3 +1,5 @@ +package classes + import net.minecraftforge.fml.common.eventhandler.EventPriority import gregtech.api.unification.material.Material; @@ -29,41 +31,34 @@ import supersymmetry.api.unification.material.properties.FiberProperty; class ChangeFlags { private static void setupSlurries(Material mat) { def property = new FluidProperty() - property.getStorage().enqueueRegistration(SusyFluidStorageKeys.SLURRY, new FluidBuilder()) - property.getStorage().enqueueRegistration(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) + property.enqueueRegistration(SusyFluidStorageKeys.SLURRY, new FluidBuilder()) + property.enqueueRegistration(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) - property.getStorage().enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder()) mat.setProperty(PropertyKey.FLUID, property) } private static void setupFluidType(Material mat, FluidStorageKey key, int temp) { if (mat.getProperty(PropertyKey.FLUID) == null) { def property = new FluidProperty(); - property.getStorage().enqueueRegistration(key, new FluidBuilder().temperature(temp)) + property.enqueueRegistration(key, new FluidBuilder().temperature(temp)) mat.setProperty(PropertyKey.FLUID, property) } else { def property = mat.getProperty(PropertyKey.FLUID) - if (property.getStorage().getQueuedBuilder(key) != null) { - property.getStorage().getQueuedBuilder(key).temperature(temp) + if (property.getQueuedBuilder(key) != null) { + property.getQueuedBuilder(key).temperature(temp) } else { - property.getStorage().enqueueRegistration(key, new FluidBuilder().temperature(temp)) + property.enqueueRegistration(key, new FluidBuilder().temperature(temp)) } } - if (mat.getProperty(PropertyKey.FLUID).getStorage().getQueuedBuilder(FluidStorageKeys.LIQUID) == null) { - setupFluidType(mat, FluidStorageKeys.LIQUID, temp) - } } private static void setupFluidType(Material mat, FluidStorageKey key) { if (mat.getProperty(PropertyKey.FLUID) == null) { def property = new FluidProperty(); - property.getStorage().enqueueRegistration(key, new FluidBuilder()) + property.enqueueRegistration(key, new FluidBuilder()) mat.setProperty(PropertyKey.FLUID, property) } else { def property = mat.getProperty(PropertyKey.FLUID) - property.getStorage().enqueueRegistration(key, new FluidBuilder()) - } - if (mat.getProperty(PropertyKey.FLUID).getStorage().getQueuedBuilder(FluidStorageKeys.LIQUID) == null) { - setupFluidType(mat, FluidStorageKeys.LIQUID) + property.enqueueRegistration(key, new FluidBuilder()) } } @@ -96,11 +91,11 @@ class ChangeFlags { setupFluidType(Iodine, FluidStorageKeys.GAS, 460) setupFluidType(Chlorine, FluidStorageKeys.PLASMA) setupFluidType(Selenium, FluidStorageKeys.LIQUID, 494) - setupFluidType(Iron3Chloride, FluidStorageKeys.GAS, 590) + //setupFluidType(Iron3Chloride, FluidStorageKeys.GAS, 590) Polybenzimidazole.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, true)) Polytetrafluoroethylene.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, false)) - Polydimethylsiloxane.setProperty(PropertyKey.FLUID, new FluidProperty()); + Polydimethylsiloxane.setProperty(PropertyKey.FLUID, new FluidProperty(FluidStorageKeys.LIQUID, new FluidBuilder())); Tantalum.setProperty(PropertyKey.BLAST, new BlastProperty(3293, GasTier.MID, 480, 240, -1, -1)); Molybdenum.setProperty(PropertyKey.BLAST, new BlastProperty(2890, GasTier.MID, 480, 240, -1, -1)); @@ -135,6 +130,7 @@ class ChangeFlags { Indium.addFlags("generate_plate"); BisphenolA.addFlags("no_unification"); Phosphorus.addFlags("no_smelting"); + Tetrahedrite.addFlags("no_smelting"); /* ManganesePhosphide.addFlags("no_smashing", "no_smelting") @@ -163,7 +159,9 @@ class ChangeFlags { AquaRegia.setFormula("(HNO3)(HCl)3", true); Tantalite.setFormula("(Fe,Mn)Ta2O6", true); Lepidolite.setFormula("(K,Rb)AlLi2Si4O10(OH,F)2", true); + Tetrahedrite.setFormula("Cu12Sb4S13", true); IndiumGalliumPhosphide.setFormula("InGaP2", true); + NetherAir.setFormula("(N78O21Ar9)24(CO2)2(H2S)(SO2)", true) // Ore Processing @@ -177,6 +175,7 @@ class ChangeFlags { Tantalite.addFlags("generate_sifted", "generate_flotated", "generate_concentrate"); setupSlurries(Tantalite) setupSlurries(Galena) + setupSlurries(Stibnite) setupSlurries(Cinnabar) Ilmenite.addFlags("generate_flotated", "generate_concentrate"); setupSlurries(Ilmenite) @@ -188,6 +187,7 @@ class ChangeFlags { Rutile.addFlags("generate_concentrate"); setupSlurries(Sphalerite) setupSlurries(Pollucite) + setupSlurries(Arsenopyrite) setupFluidType(PolyvinylAcetate, FluidStorageKeys.LIQUID, 385) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index f9a70fe3f..a6c6d4036 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -527,7 +527,13 @@ public class FirstDegreeMaterials { .colorAverage() .build(); - //FREE ID: 8165 + SodiumThioantimoniteSolution = new Material.Builder(8165, SuSyUtility.susyId('sodium_thioantimonite_solution')) + .liquid() + .components(Sodium * 12, Antimony * 4, Sulfur * 12, Water * 12) + .colorAverage() + .build(); + + SodiumThioantimoniteSolution.setFormula("(Na3SbS3)12(H2O)12", true) AmmoniaSolution = new Material.Builder(8166, SuSyUtility.susyId('ammonia_solution')) .liquid() @@ -553,7 +559,11 @@ public class FirstDegreeMaterials { .colorAverage() .build(); - //FREE ID: 8170 + CopperISulfide = new Material.Builder(8170, SuSyUtility.susyId('copper_i_sulfide')) + .dust() + .components(Copper * 2, Sulfur) + .color(0x1a1101) + .build(); Cryolite = new Material.Builder(8171, SuSyUtility.susyId('cryolite')) .dust().liquid(new FluidBuilder().temperature(1285)) @@ -667,7 +677,11 @@ public class FirstDegreeMaterials { .build() .setFormula("(Fe(NO3)2)3(H3AsO4)3(H2O)3", true) - //FREE ID: 8190 + CopperIISulfide = new Material.Builder(8190, SuSyUtility.susyId('copper_ii_sulfide')) + .dust() + .components(Copper, Sulfur) + .color(0x262626) + .build() ArsenicTrichloride = new Material.Builder(8191, SuSyUtility.susyId('arsenic_trichloride')) .liquid() @@ -676,7 +690,11 @@ public class FirstDegreeMaterials { .colorAverage() .build() - //FREE ID: 8191 + PotassiumPermanganate = new Material.Builder(8192, SuSyUtility.susyId('potassium_permanganate')) + .dust() + .components(Potassium, Manganese, Oxygen * 4) + .color(0x320354) + .build(); SperryliteWaste = new Material.Builder(8193, SuSyUtility.susyId('sperrylite_waste')) .liquid() @@ -779,7 +797,17 @@ public class FirstDegreeMaterials { .color(0xa9aec4) .build() - //FREE IDs: 8208-8209 + PurifiedAntimonyTrichloride = new Material.Builder(8208, SuSyUtility.susyId('purified_antimony_trichloride')) + .liquid(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(347)) + .components(Antimony * 1, Chlorine * 3) + .color(0x83b87b) + .build(); + + PurifiedAntimonyTrioxide = new Material.Builder(8209, SuSyUtility.susyId('purified_antimony_trioxide')) + .dust() + .components(Antimony * 2, Oxygen * 3) + .color(0x92d1d4) + .build(); DicobaltOctacarbonyl = new Material.Builder(8210, SuSyUtility.susyId('dicobalt_octacarbonyl')) .dust() @@ -845,7 +873,11 @@ public class FirstDegreeMaterials { .color(0x54362c) .build() - //FREE ID: 8220 + HeavyNetherGases = new Material.Builder(8220, SuSyUtility.susyId('heavy_nether_gases')) + .gas() + .components(CarbonDioxide * 3, HydrogenSulfide) + .colorAverage() + .build(); ThionylChloride = new Material.Builder(8221, SuSyUtility.susyId('thionyl_chloride')) .liquid() @@ -1243,7 +1275,14 @@ public class FirstDegreeMaterials { .colorAverage() .build(); - // FREE ID: 8286 + CryogenicSolder = new Material.Builder(8286, SuSyUtility.susyId('cryogenic_solder')) + .dust().ingot().liquid(new FluidBuilder().temperature(430)) + .components(Indium * 27, Silver * 1) + .color(0x8967bf) + .build(); + + CryogenicSolder.setFormula("In97Ag3", true) + LithiumCobaltOxide = new Material.Builder(8287, SuSyUtility.susyId('lithium_cobalt_oxide')) .dust() @@ -1550,7 +1589,11 @@ public class FirstDegreeMaterials { .colorAverage() .build(); - //8332 is free + PotassiumManganate = new Material.Builder(8332, SuSyUtility.susyId('potassium_manganate')) + .dust() + .components(Potassium * 2, Manganese, Oxygen * 4) + .color(0x071c06) + .build(); RutheniumIVOxide = new Material.Builder(8333, SuSyUtility.susyId('ruthenium_iv_oxide')) .dust() @@ -1633,7 +1676,11 @@ public class FirstDegreeMaterials { .color(0x2c733a) .build(); - //FREE ID: 8346 + LeadFreeSolder = new Material.Builder(8346, SuSyUtility.susyId('lead_free_solder')) + .ingot().liquid(new FluidBuilder().temperature(411)) + .components(Bismuth * 6, Tin * 4) + .colorAverage() + .build() CopperDross = new Material.Builder(8347, SuSyUtility.susyId('copper_dross')) .dust() @@ -2510,7 +2557,13 @@ public class FirstDegreeMaterials { .colorAverage() .build(); - //FREE IDs: 8480-8485 + DenseSteam = new Material.Builder(8480, SuSyUtility.susyId('dense_steam')) + .gas(new FluidBuilder().temperature(373)) + .components(Water) + .color(0xcaddfa) + .build(); + + //FREE IDs: 8481-8485 UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry')) .liquid() @@ -2562,7 +2615,11 @@ public class FirstDegreeMaterials { .color(0xbda51b) .build(); - //FREE IDs: 8493 + GaseousIronIIIChloride = new Material.Builder(8493, SuSyUtility.susyId('gaseous_iron_iii_chloride')) + .gas(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(590)) + .components(Iron3Chloride) + .color(0xba8f49) + .build(); GaseousTitaniumTetrachloride = new Material.Builder(8494, SuSyUtility.susyId('gaseous_titanium_tetrachloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(1180)) diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy index cfe2226b0..9a10ee7ee 100644 --- a/groovy/material/SecondDegreeMaterials.groovy +++ b/groovy/material/SecondDegreeMaterials.groovy @@ -379,7 +379,11 @@ public class SecondDegreeMaterials { .colorAverage() .build(); - //FREE ID: 13059 + OxidizedManganateSolution = new Material.Builder(13059, SuSyUtility.susyId('oxidized_manganate_solution')) + .liquid() + .components(PotassiumPermanganate, PotassiumHydroxide, Water) + .color(0x48065e) + .build(); CopperSulfateSolution = new Material.Builder(13060, SuSyUtility.susyId('copper_sulfate_solution')) .liquid() diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy index 06dd7288e..5972933b8 100644 --- a/groovy/material/SuSyMaterials.groovy +++ b/groovy/material/SuSyMaterials.groovy @@ -507,6 +507,7 @@ class SuSyMaterials { public static Material CocoAmineAcetate; public static Material PolluciteLeach; public static Material CaesiumRubidiumAlumMixture; + public static Material NetherMolecularSieve; // Petrochem Materials @@ -1036,8 +1037,6 @@ class SuSyMaterials { public static Material AcidicThalliumSulfateSolution; public static Material ThalliumSulfateSolution; public static Material WaferTreatmentAcid; - public static Material ArsenicIIIOxide; - public static Material AntimonyIIIOxide; public static Material PurifiedCadmiumSolution; public static Material GermaniumTetrachloride; public static Material GermaniumDioxide; @@ -1058,6 +1057,17 @@ class SuSyMaterials { public static Material CaesiumHydroxideSolution; public static Material CaesiumFormateSolution; public static Material RubidiumHydroxide; + public static Material DenseSteam; + public static Material HeavyNetherGases; + public static Material SodiumThioantimoniteSolution; + public static Material PurifiedAntimonyTrichloride; + public static Material PurifiedAntimonyTrioxide; + public static Material CopperISulfide; + public static Material CopperIISulfide; + public static Material PotassiumManganate; + public static Material PotassiumPermanganate; + public static Material LeadFreeSolder; + public static Material CryogenicSolder; // HP Materials @@ -1242,6 +1252,7 @@ class SuSyMaterials { public static Material CaesiumChlorideSolution; public static Material RubidiumHydroxideSolution; public static Material SodiumAlumSolution; + public static Material OxidizedManganateSolution; // Organic Chemistry Materials diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy index e1a60698f..666233cbf 100644 --- a/groovy/material/UnknownCompositionMaterials.groovy +++ b/groovy/material/UnknownCompositionMaterials.groovy @@ -1181,7 +1181,13 @@ public class UnknownCompositionMaterials { .color(0xcfa532) .build(); - //FREE IDs: 4240-4241 + NetherMolecularSieve = new Material.Builder(4240, SuSyUtility.susyId('nether_molecular_sieve')) + .dust() + .color(0x6e6565) + .iconSet(DULL) + .build(); + + //FREE ID: 4241 GraniteTailingSlurry = new Material.Builder(4242, SuSyUtility.susyId('granite_tailing_slurry')) .liquid() diff --git a/groovy/postInit/biology/GreenhouseChain.groovy b/groovy/postInit/biology/GreenhouseChain.groovy index e91cfa707..fd96ae6f4 100755 --- a/groovy/postInit/biology/GreenhouseChain.groovy +++ b/groovy/postInit/biology/GreenhouseChain.groovy @@ -19,10 +19,8 @@ MACERATOR = recipemap('macerator') // Fertilizer * 4 mods.gregtech.mixer.removeByInput(30, [item('minecraft:dirt'), metaitem('dustWood') * 2, item('minecraft:sand') * 4], [fluid('water') * 1000]) -mods.gregtech.blender.removeByInput(30, [item('minecraft:dirt'), metaitem('dustWood') * 2, item('minecraft:sand') * 4], [fluid('water') * 1000]) // Fertilizer Solution * 5000 mods.gregtech.mixer.removeByInput(16, [item('minecraft:dye', 15)], [fluid('water') * 5000]) -mods.gregtech.blender.removeByInput(16, [item('minecraft:dye', 15)], [fluid('water') * 5000]) // Greenhouse Glass * 1 mods.gregtech.assembler.removeByInput(24, [metaitem('gregtechfoodoption:cupric_hydrogen_arsenite_dust'), item('gregtech:transparent_casing')], null) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 4de91f407..949f0dc39 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -44,6 +44,7 @@ VACUUM_DT = recipemap('vacuum_distillation') CRACKER = recipemap('cracker') FLUID_HEATER = recipemap('fluid_heater') PHASE_SEPARATOR = recipemap('phase_separator') +CONDENSER = recipemap('condenser') ASSEMBLER.recipeBuilder() .inputs(ore('stickIron') * 4) @@ -266,7 +267,7 @@ FLUIDIZEDBR.recipeBuilder() .fluidInputs(fluid('hydrogen_chloride') * 1000) .fluidInputs(fluid('oxygen') * 500) .fluidOutputs(fluid('chlorine') * 1000) - .fluidOutputs(fluid('steam') * 500) + .fluidOutputs(fluid('dense_steam') * 500) .duration(40) .EUt(120) .buildAndRegister() @@ -276,7 +277,7 @@ FLUIDIZEDBR.recipeBuilder() .fluidInputs(fluid('hydrogen_chloride') * 1000) .fluidInputs(fluid('oxygen') * 500) .fluidOutputs(fluid('chlorine') * 1000) - .fluidOutputs(fluid('steam') * 500) + .fluidOutputs(fluid('dense_steam') * 500) .duration(10) .EUt(120) .buildAndRegister() @@ -489,7 +490,7 @@ DISTILLERY.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustSodiumBisulfate') * 14) .outputs(metaitem('dustSodiumSulfate') * 7) -.fluidOutputs(fluid('steam') * 1000) +.fluidOutputs(fluid('dense_steam') * 1000) .fluidOutputs(fluid('sulfur_trioxide') * 1000) .duration(60) .EUt(30) @@ -499,7 +500,7 @@ ROASTER.recipeBuilder() .circuitMeta(1) .inputs(ore('dustPotassiumBisulfate') * 14) .outputs(metaitem('dustPotassiumSulfate') * 7) -.fluidOutputs(fluid('steam') * 1000) +.fluidOutputs(fluid('dense_steam') * 1000) .fluidOutputs(fluid('sulfur_trioxide') * 1000) .duration(60) .EUt(30) @@ -509,7 +510,7 @@ ROASTER.recipeBuilder() .circuitMeta(2) .inputs(ore('dustPotassiumBisulfate') * 14) .outputs(metaitem('dustPotassiumPyrosulfate') * 11) -.fluidOutputs(fluid('steam') * 1000) +.fluidOutputs(fluid('dense_steam') * 1000) .duration(60) .EUt(30) .buildAndRegister() @@ -613,7 +614,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('carbon_dioxide') * 1000) .fluidInputs(fluid('hydrogen') * 8000) .fluidOutputs(fluid('methane') * 1000) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(200) .EUt(120) .buildAndRegister() @@ -623,7 +624,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('carbon_monoxide') * 1000) .fluidInputs(fluid('hydrogen') * 6000) .fluidOutputs(fluid('methane') * 1000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .duration(150) .EUt(120) .buildAndRegister() @@ -738,7 +739,6 @@ DISTILLERY.recipeBuilder() mods.gregtech.centrifuge.removeByInput(30, null, [fluid('gtfo_sodium_carbonate_solution') * 1000]) // Sodium Carbonate Solution * 1000 mods.gregtech.mixer.removeByInput(30, [metaitem('dustSodaAsh')], [fluid('water') * 1000]) -mods.gregtech.blender.removeByInput(30, [metaitem('dustSodaAsh')], [fluid('water') * 1000]) // Dutched Chocolate Liquor * 1 mods.gregtech.chemical_bath.removeByInput(540, [metaitem('gregtechfoodoption:chocolate_liquor_refined_crushed')], [fluid('gtfo_sodium_carbonate_solution') * 1000]) @@ -825,7 +825,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustAmmoniumChloride') * 12) .inputs(ore('dustQuicklime') * 2) .fluidOutputs(fluid('ammonia') * 2000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .outputs(metaitem('dustCalciumChloride') * 3) .duration(120) .EUt(30) @@ -870,7 +870,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustSodiumBicarbonate') * 12) .fluidOutputs(fluid('carbon_dioxide') * 1000) -.fluidOutputs(fluid('steam') * 1000) +.fluidOutputs(fluid('dense_steam') * 1000) .outputs(metaitem('dustSodaAsh') * 6) .duration(80) .EUt(30) @@ -889,7 +889,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustAmmoniumNitrate') * 9) -.fluidOutputs(fluid('steam') * 2000) +.fluidOutputs(fluid('dense_steam') * 2000) .fluidOutputs(fluid('nitric_oxide') * 1000) .duration(120) .EUt(30) @@ -898,7 +898,7 @@ ROASTER.recipeBuilder() CSTR.recipeBuilder() .fluidInputs(fluid('ammonia') * 100) .fluidInputs(fluid('oxygen') * 250) -.fluidOutputs(fluid('steam') * 150) +.fluidOutputs(fluid('dense_steam') * 150) .fluidOutputs(fluid('nitric_oxide') * 100) .duration(5) .EUt(30) @@ -1517,7 +1517,7 @@ DISTILLERY.recipeBuilder() BR.recipeBuilder() .fluidInputs(fluid('sodium_hydroxide_solution') * 2000) -.fluidInputs(fluid('steam') * 1000) +.fluidInputs(fluid('dense_steam') * 1000) .inputs(ore('dustSiliconDioxide') * 3) .fluidOutputs(fluid('diluted_sodium_silicate_solution') * 4000) .duration(200) @@ -1697,7 +1697,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustCalciumHydroxide') * 5) .fluidInputs(fluid('carbon_dioxide') * 1000) .outputs(metaitem('dustCalcite') * 5) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(120) .buildAndRegister() @@ -1706,7 +1706,7 @@ ROASTER.recipeBuilder() .circuitMeta(2) .inputs(ore('dustCalciumHydroxide') * 5) .outputs(metaitem('dustQuicklime') * 2) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(120) .buildAndRegister() @@ -2089,7 +2089,7 @@ DISTILLATION_TOWER.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('hot_hp_methane') * 1000) -.fluidInputs(fluid('steam') * 1000) +.fluidInputs(fluid('dense_steam') * 1000) .notConsumable(ore('dustAnyPurityNickel')) .fluidOutputs(fluid('syngas') * 7000) .duration(160) @@ -2098,7 +2098,7 @@ REACTION_FURNACE.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('hot_hp_natural_gas') * 1500) -.fluidInputs(fluid('steam') * 1000) +.fluidInputs(fluid('dense_steam') * 1000) .notConsumable(ore('dustAnyPurityNickel')) .fluidOutputs(fluid('syngas') * 7000) .duration(160) @@ -2134,7 +2134,7 @@ BR.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('syngas') * 7000) - .fluidInputs(fluid('steam') * 1000) + .fluidInputs(fluid('dense_steam') * 1000) .notConsumable(metaitem('catalystBedLtsCatalyst')) .fluidOutputs(fluid('reformed_syngas') * 9000) .duration(320) @@ -2143,7 +2143,7 @@ REACTION_FURNACE.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('syngas') * 7000) - .fluidInputs(fluid('steam') * 1000) + .fluidInputs(fluid('dense_steam') * 1000) .notConsumable(metaitem('dustHtsCatalyst')) .fluidOutputs(fluid('reformed_syngas') * 9000) .duration(160) @@ -2262,7 +2262,7 @@ CHEMICAL_BATH.recipeBuilder() FLUIDIZEDBR.recipeBuilder() .fluidInputs(fluid('ethylene') * 50) -.fluidInputs(fluid('steam') * 50) +.fluidInputs(fluid('dense_steam') * 50) .notConsumable(metaitem('dustPhosphoricAcidSilicaGel')) .fluidOutputs(fluid('ethanol') * 50) .duration(5) @@ -2599,7 +2599,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustDurene') * 4) .fluidInputs(fluid('oxygen') * 2000) .outputs(metaitem('dustPyromelliticDianhydride') * 3) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .duration(200) .EUt(Globals.voltAmps[1]) .buildAndRegister(); @@ -3825,7 +3825,7 @@ ROASTER.recipeBuilder() .fluidInputs(fluid('nickel_ii_bisacetylacetonate_solution') * 2000) .outputs(metaitem('dustNickelIiBisacetylacetonate')) .outputs(metaitem('dustSodiumNitrate') * 10) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(120) .EUt(480) .buildAndRegister() @@ -4137,7 +4137,7 @@ BR.recipeBuilder() .fluidInputs(fluid('gtfo_acetaldehyde') * 2000) .fluidInputs(fluid('sodium_hydroxide_solution') * 1000) .fluidOutputs(fluid('crotonaldehyde_mixture') * 1000) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(400) .EUt(120) .buildAndRegister() @@ -4253,6 +4253,22 @@ DISTILLERY.recipeBuilder() .EUt(200) .buildAndRegister() +// Dense steam processing + +FLUID_HEATER.recipeBuilder() + .circuitMeta(3) + .fluidInputs(fluid('water') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +CONDENSER.recipeBuilder() + .fluidInputs(fluid('dense_steam') * 1000) + .fluidOutputs(fluid('water') * 1000) + .duration(5) + .buildAndRegister() + // Nitration Mixture * 2000 mods.gregtech.mixer.removeByInput(2, null, [fluid('nitric_acid') * 1000, fluid('sulfuric_acid') * 1000]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy index e534cc4eb..c42891765 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy @@ -91,7 +91,7 @@ REACTION_FURNACE.recipeBuilder() .inputs(ore('dustGarnierite')) .fluidInputs(fluid('hydrogen') * 2000) .outputs(metaitem('dustNickel')) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(40) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/CopperChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/CopperChain.groovy index 60a4fce86..991474b19 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/CopperChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/CopperChain.groovy @@ -260,3 +260,21 @@ ELECTROLYTIC_CELL.recipeBuilder() .duration(240) .EUt(Globals.voltAmps[2]) .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustCopperISulfide') * 3) + .fluidInputs(fluid('oxygen') * 2000) + .outputs(metaitem('dustCopper') * 2) + .fluidOutputs(fluid('sulfur_dioxide') * 1000) + .EUt(Globals.voltAmps[2]) + .duration(80) + .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustCopperIiSulfide') * 2) + .fluidInputs(fluid('oxygen') * 2000) + .outputs(metaitem('dustCopper')) + .fluidOutputs(fluid('sulfur_dioxide') * 1000) + .EUt(Globals.voltAmps[2]) + .duration(80) + .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy index 7e4d6f57e..843f29cea 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy @@ -170,7 +170,7 @@ BATCH_REACTOR.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('iron_iii_nitrate_solution') * 6000) .outputs(metaitem('dustIronIiiOxide') * 5) - .fluidOutputs(fluid('steam') * 6000) + .fluidOutputs(fluid('dense_steam') * 6000) .fluidOutputs(fluid('nitrogen_dioxide') * 6000) .fluidOutputs(fluid('oxygen') * 3000) .duration(80) @@ -198,7 +198,7 @@ BATCH_REACTOR.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('chloroauric_acid_solution') * 1000) .outputs(metaitem('dustChloroauricAcid') * 15) - .fluidOutputs(fluid('steam') * 6500) + .fluidOutputs(fluid('dense_steam') * 6500) .fluidOutputs(fluid('nitrogen_dioxide') * 1000) .fluidOutputs(fluid('oxygen') * 500) .duration(240) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy index 7702ff4e1..65cfb8ecc 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy @@ -33,7 +33,7 @@ CENTRIFUGE.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('hafnium_sulfate_solution') * 2000) .outputs(metaitem('dustHafniumDioxide') * 3) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .fluidOutputs(fluid('sulfur_trioxide') * 2000) .EUt(Globals.voltAmps[1]) .duration(20) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy index 53b184bf7..0bfbb8d4c 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy @@ -126,7 +126,7 @@ for (highPurityCombustible in highPurityCombustibles()) { .inputs(ore('dustIlmenite')) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(1)) .chancedOutput(metaitem(highPurityCombustible.byproduct), 1000, 0) - .fluidOutputs(fluid('iron_iii_chloride') * 800) + .fluidOutputs(fluid('gaseous_iron_iii_chloride') * 800) .fluidOutputs(fluid('carbon_monoxide') * 1000) .outputs(metaitem('dustRutile') * 3) .duration(100 * highPurityCombustible.duration) @@ -165,7 +165,7 @@ for (highPurityCombustible in highPurityCombustibles()) { } VACUUM_FREEZER.recipeBuilder() - .fluidInputs(fluid('iron_iii_chloride') * 1000) + .fluidInputs(fluid('gaseous_iron_iii_chloride') * 1000) .outputs(metaitem('dustIronIiiChloride') * 4) .duration(200) .EUt(Globals.voltAmps[1] * 2) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy index 99cf53632..1ea6bb2d6 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy @@ -252,7 +252,7 @@ ROASTER.recipeBuilder() ROASTER.recipeBuilder() // Niobium Oxide .inputs(ore('dustNiobiumOxideDihydrate') * 9) .outputs(metaitem('dustNiobiumOxide') * 7) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(80) .EUt(Globals.voltAmps[3]) .buildAndRegister() @@ -278,7 +278,7 @@ CENTRIFUGE.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('metal_sulfate_waste') * 1000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .chancedOutput(metaitem('dustIronSulfate') * 6, 5000, 0) .chancedOutput(metaitem('dustManganeseIiSulfate') * 6, 5000, 0) .duration(80) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/VanadiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/VanadiumChain.groovy index 8a16100ed..83a22ed06 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/VanadiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/VanadiumChain.groovy @@ -111,7 +111,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustAmmoniumMetavanadate') * 18) .outputs(metaitem('dustVanadiumPentoxide') * 7) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .fluidOutputs(fluid('ammonia') * 2000) .duration(80) .EUt(120) @@ -172,7 +172,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustMagnesiumHydroxide') * 5) .fluidInputs(fluid('carbon_dioxide') * 1000) .outputs(metaitem('dustMagnesiumCarbonate') * 5) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(160) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/ChromiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/ChromiumChain.groovy index 706575bfd..cd7309b4c 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/ChromiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/ChromiumChain.groovy @@ -88,7 +88,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustChromiumIiiHydroxide') * 14) .outputs(metaitem('dustChromiumIiiOxide') * 5) -.fluidOutputs(fluid('steam') * 3000) +.fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[2]) .duration(100) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/MolybdenumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/MolybdenumChain.groovy index fd6e7dfed..a1be03817 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/MolybdenumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/MolybdenumChain.groovy @@ -94,7 +94,7 @@ CRYSTALLIZER.recipeBuilder() .fluidInputs(fluid('ammonium_chloride_solution') * 4000) .outputs(metaitem('dustAmmoniumDimolybdate') * 19) .fluidOutputs(fluid('ammonia') * 2000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .fluidOutputs(fluid('salt_water') * 4000) .duration(100) .EUt(Globals.voltAmps[3]) @@ -124,7 +124,7 @@ CRYSTALLIZER.recipeBuilder() .fluidInputs(fluid('ammonium_molybdate_solution') * 2000) .outputs(metaitem('dustAmmoniumDimolybdate') * 19) .fluidOutputs(fluid('ammonia') * 2000) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .fluidOutputs(fluid('wastewater') * 1000) .duration(100) .EUt(Globals.voltAmps[3]) @@ -163,7 +163,7 @@ CRYSTALLIZER.recipeBuilder() .fluidInputs(fluid('neutralized_ammonium_molybdate_solution') * 8000) .outputs(metaitem('dustAmmoniumDimolybdate') * 19) .fluidOutputs(fluid('ammonia') * 2000) - .fluidOutputs(fluid('steam') * 7000) + .fluidOutputs(fluid('dense_steam') * 7000) .fluidOutputs(fluid('ammonium_chloride_solution') * 2000) .duration(100) .EUt(Globals.voltAmps[3]) @@ -174,7 +174,7 @@ CRYSTALLIZER.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustAmmoniumDimolybdate') * 19) .outputs(metaitem('dustPurifiedMolybdenumTrioxide') * 8) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .fluidOutputs(fluid('ammonia') * 2000) .duration(100) .EUt(Globals.voltAmps[3]) @@ -214,7 +214,7 @@ SIFTER.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('hydrogen') * 6000) .inputs(ore('dustPurifiedMolybdenumTrioxide') * 4) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .outputs(metaitem('dustMolybdenum')) .duration(100) .EUt(Globals.voltAmps[4]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/TungstenChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/TungstenChain.groovy index e2f52d4b0..e0e92dfb4 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/TungstenChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group6/TungstenChain.groovy @@ -61,7 +61,7 @@ ROASTER.recipeBuilder() .fluidInputs(fluid('hydrochloric_acid') * 50) .outputs(metaitem('dustCalcinedScheelite')) .fluidOutputs(fluid('hydrogen_chloride') * 25) - .fluidOutputs(fluid('steam') * 50) + .fluidOutputs(fluid('dense_steam') * 50) .duration(20) .EUt(Globals.voltAmps[1]) .buildAndRegister() @@ -217,7 +217,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustAmmoniumParatungstate')) .fluidInputs(fluid('air') * 1000) .outputs(metaitem('dustTungstenTrioxide') * 48) - .fluidOutputs(fluid('steam') * 10000) + .fluidOutputs(fluid('dense_steam') * 10000) .fluidOutputs(fluid('ammonia') * 10000) .EUt(Globals.voltAmps[3]) .duration(1200) @@ -228,7 +228,7 @@ ROASTER.recipeBuilder() REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('hydrogen') * 6000) .inputs(ore('dustTungstenTrioxide') * 4) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .outputs(ore('dustTungsten').first()) .duration(100) .EUt(Globals.voltAmps[4]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy index 3850af69f..d107b17f3 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy @@ -72,7 +72,7 @@ def hydrocarbonReductants = [ def reductants = [ new ReductantManganese('carbon_monoxide', 'carbon_dioxide', 1000, 1000), - new ReductantManganese('hydrogen', 'steam', 2000, 1000) + new ReductantManganese('hydrogen', 'dense_steam', 2000, 1000) ] /* @@ -86,7 +86,7 @@ for (reductant in hydrocarbonReductants) { .fluidInputs(fluid(reductant.name) * reductant.amount_required) .outputs(metaitem('dustManganeseIiOxide') * 2) .fluidOutputs(fluid(reductant.byproduct) * reductant.byproduct_amount) - .fluidOutputs(fluid('steam') * (1000 - reductant.byproduct_amount)) + .fluidOutputs(fluid('dense_steam') * (1000 - reductant.byproduct_amount)) .duration(120) .EUt(Globals.voltAmps[3]) .buildAndRegister() @@ -196,8 +196,39 @@ ROASTER.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustManganeseIiHydroxide') * 5) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .outputs(metaitem('dustManganeseIiOxide') * 2) .duration(200) .EUt(30) + .buildAndRegister() + +// Potassium permanganate + +ROASTER.recipeBuilder() + .inputs(ore('dustManganeseDioxide') * 3) + .fluidInputs(fluid('potassium_hydroxide') * 864) + .fluidInputs(fluid('oxygen') * 1000) + .outputs(metaitem('dustPotassiumManganate') * 7) + .fluidOutputs(fluid('steam') * 2000) + .duration(200) + .EUt(30) + .buildAndRegister() + +ELECTROLYTIC_CELL.recipeBuilder() + .notConsumable(ore('plateNickel') * 4) + .notConsumable(ore('plateIron') * 4) + .inputs(ore('dustPotassiumManganate') * 7) + .fluidInputs(fluid('distilled_water') * 2000) + .fluidOutputs(fluid('oxidized_manganate_solution') * 1000) + .fluidOutputs(fluid('hydrogen') * 1000) + .duration(200) + .EUt(120) + .buildAndRegister() + +CRYSTALLIZER.recipeBuilder() + .fluidInputs(fluid('oxidized_manganate_solution') * 1000) + .outputs(metaitem('dustPotassiumPermanganate') * 6) + .fluidOutputs(fluid('potassium_hydroxide_solution') * 1000) + .duration(200) + .EUt(30) .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/RheniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/RheniumChain.groovy index 0112fe486..9dd8f711b 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/RheniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/RheniumChain.groovy @@ -53,7 +53,7 @@ REACTION_FURNACE.recipeBuilder() .inputs(ore('dustAmmoniumPerrhenate') * 10) .fluidInputs(fluid('hydrogen') * 7000) .outputs(metaitem('dustRhenium')) - .fluidOutputs(fluid('steam') * 4000) + .fluidOutputs(fluid('dense_steam') * 4000) .fluidOutputs(fluid('ammonia') * 1000) .duration(200) .EUt(Globals.voltAmps[4]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy index 75c43a7cb..e887e889a 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy @@ -82,7 +82,7 @@ def blastables = [ def reductants = [ new ReductantIron('carbon_monoxide', 'carbon_dioxide', 1, 1), - new ReductantIron('hydrogen', 'steam', 2, 1) + new ReductantIron('hydrogen', 'dense_steam', 2, 1) ] def combustibles = combustibles() @@ -256,7 +256,7 @@ EBF_RECIPES.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustIronIiiHydroxide') * 14) .outputs(metaitem('dustIronIiiOxide') * 5) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .duration(80) .EUt(30) .buildAndRegister() @@ -264,7 +264,7 @@ ROASTER.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustIronIiHydroxide') * 5) .outputs(metaitem('dustIronIiOxide') * 2) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(Globals.voltAmps[1]) .duration(200) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/f_block/actinides/UraniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/f_block/actinides/UraniumChain.groovy index 5282ac466..290a394ce 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/f_block/actinides/UraniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/f_block/actinides/UraniumChain.groovy @@ -134,7 +134,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('hydrogen') * 2000) .outputs(metaitem('dustUraniumDioxide') * 6) .fluidOutputs(fluid('ammonia') * 2000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(3840) .duration(600) .buildAndRegister() @@ -152,7 +152,7 @@ ROTARY_KILN.recipeBuilder() .inputs(ore('dustUraniumDioxide') * 3) .fluidInputs(fluid('hydrogen_fluoride') * 4000) .outputs(metaitem('dustUraniumTetrafluoride') * 5) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .EUt(1920) .duration(80) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy index 74209bd3c..aeb8caeca 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy @@ -31,13 +31,10 @@ EBF.recipeBuilder() // Ruby Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedRuby') * 2], [fluid('aqua_regia') * 3000]) -mods.gregtech.blender.removeByInput(1920, [metaitem('crushedRuby') * 2], [fluid('aqua_regia') * 3000]) // Sapphire Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedSapphire') * 2], [fluid('aqua_regia') * 3000]) -mods.gregtech.blender.removeByInput(1920, [metaitem('crushedSapphire') * 2], [fluid('aqua_regia') * 3000]) // Green Sapphire Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedGreenSapphire') * 2], [fluid('aqua_regia') * 3000]) -mods.gregtech.blender.removeByInput(1920, [metaitem('crushedGreenSapphire') * 2], [fluid('aqua_regia') * 3000]) // Bauxite -> Red Mud @@ -83,7 +80,7 @@ CRYSTALLIZER.recipeBuilder() EBF.recipeBuilder() .inputs(ore('dustAluminiumHydroxide') * 14) -.fluidOutputs(fluid('steam') * 3000) +.fluidOutputs(fluid('dense_steam') * 3000) .outputs(metaitem('dustAlumina') * 5) .duration(100) .blastFurnaceTemp(1400) @@ -121,7 +118,7 @@ ELECTROLYTIC_CELL.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('hydrofluoric_acid') * 6000) .inputs(ore('dustAlumina') * 5) -.fluidOutputs(fluid('steam') * 9000) +.fluidOutputs(fluid('dense_steam') * 9000) .outputs(metaitem('dustAluminiumTrifluoride') * 8) .duration(300) .EUt(16) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/BoronChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/BoronChain.groovy index 83430e486..2d2df0677 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/BoronChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/BoronChain.groovy @@ -15,7 +15,7 @@ FORMINGPRESS = recipemap('forming_press') ROASTER.recipeBuilder() .inputs(ore('dustBorax') * 4) .outputs(metaitem('dustSodiumTetraborate') * 13) - .fluidOutputs(fluid('steam') * 10000) + .fluidOutputs(fluid('dense_steam') * 10000) .duration(200) .EUt(Globals.voltAmps[1]) .buildAndRegister() @@ -44,7 +44,7 @@ BATCH_REACTOR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustBoricAcid') * 14) .outputs(metaitem('dustBoronTrioxide') * 5) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .duration(100) .EUt(Globals.voltAmps[1]) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy index 5f640fe27..301b1ce0f 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy @@ -94,7 +94,6 @@ VACUUM_DT.recipeBuilder() //GALLIUM ARSENIDE PRODUCTION (LIQUID ENCAPSULATED CZOCHIRALSKI PROCESS) mods.gregtech.mixer.removeByInput(7, [metaitem('dustGallium'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(7, [metaitem('dustGallium'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) //SEED CRYSTAL CRYSTALLIZER.recipeBuilder() .inputs(ore('dustSmallHighPurityArsenic')) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/GermaniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/GermaniumChain.groovy index 20886430b..df5a2d312 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/GermaniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/GermaniumChain.groovy @@ -107,7 +107,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustIronOxalateDihydrate') * 9) .outputs(metaitem('dustIronIiOxide') * 2) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .fluidOutputs(fluid('carbon_monoxide') * 1000) .fluidOutputs(fluid('carbon_dioxide') * 1000) .duration(200) @@ -209,7 +209,7 @@ TUBE_FURNACE.recipeBuilder() .inputs(ore('dustGermaniumDioxide') * 3) .fluidInputs(fluid('hydrogen') * 4000) .outputs(metaitem('dustGermanium')) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(200) .EUt(30) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy index 1e4841773..1f2933817 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy @@ -262,7 +262,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('salty_arsenic_acid') * 6000) .outputs(metaitem('dustSaltyArsenicPentoxide') * 7) - .fluidOutputs(fluid('steam') * 9000) + .fluidOutputs(fluid('dense_steam') * 9000) .EUt(120) .duration(200) .buildAndRegister() @@ -451,8 +451,7 @@ ROASTER.recipeBuilder() SIFTER.recipeBuilder() .notConsumable(metaitem('item_filter')) .fluidInputs(fluid('antimony_arsenic_flue_gas') * 1000) - .outputs(metaitem('dustAntimonyTrioxide') * 5) - .outputs(metaitem('dustArsenicTrioxide') * 5) + .outputs(metaitem('dustAntimonyArsenicFlueDust')) .fluidOutputs(fluid('flue_gas') * 1000) .EUt(120) .duration(160) @@ -499,7 +498,7 @@ ELECTROLYZER.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustLeadIiHydroxide') * 5) .outputs(metaitem('dustLeadOxide') * 2) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .duration(80) .EUt(30) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy index 1047a0cff..27bac05fa 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy @@ -131,7 +131,7 @@ ROASTER.recipeBuilder() .inputs(ore('dustPurifiedTinIiOxide') * 2) .fluidInputs(fluid('hydrogen') * 2000) .outputs(metaitem('dustHighPurityTin')) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(120) .duration(120) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy index bf1bd61ef..53f0e6330 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy @@ -2,6 +2,118 @@ import globals.Globals BR = recipemap('batch_reactor') ROASTER = recipemap('roaster') +MIXER = recipemap('mixer') +FLOTATION = recipemap('froth_flotation') +CLARIFIER = recipemap('clarifier') +EBF = recipemap('electric_blast_furnace') +BR = recipemap('batch_reactor') +REACTION_FURNACE = recipemap('reaction_furnace') + +// BENEFICIATION + + // LIQUIDATION (1.5x) + + ROASTER.recipeBuilder() + .inputs(ore('dustImpureStibnite') * 2) + .notConsumable(fluid('nitrogen') * 8000) + .outputs(metaitem('dustStibnite') * 3) + .outputs(metaitem('dustPegmatiteTailings')) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + + // FLOTATION (2x) + + MIXER.recipeBuilder() + .inputs(ore('dustImpureStibnite') * 8) + .fluidInputs(fluid('distilled_water') * 2000) + .fluidOutputs(fluid('impure_stibnite_slurry') * 2000) + .EUt(Globals.voltAmps[3]) + .duration(80) + .buildAndRegister() + + FLOTATION.recipeBuilder() + .fluidInputs(fluid('impure_stibnite_slurry') * 2000) + .notConsumable(metaitem('dustSodiumIsobutylXanthate')) + .notConsumable(metaitem('dustLeadNitrate')) + .notConsumable(fluid('sodium_cyanide_solution') * 100) + .fluidOutputs(fluid('stibnite_slurry') * 1000) + .fluidOutputs(fluid('pegmatite_tailing_slurry') * 1000) + .EUt(Globals.voltAmps[3]) + .duration(80) + .buildAndRegister() + + CLARIFIER.recipeBuilder() + .fluidInputs(fluid('stibnite_slurry') * 1000) + .outputs(metaitem('dustStibnite') * 16) + .fluidOutputs(fluid('wastewater') * 1000) + .EUt(Globals.voltAmps[1]) + .duration(20) + .buildAndRegister() + +// PROCESSING + +ROASTER.recipeBuilder() + .inputs(ore('dustAntimonyIiiSulfide') * 5) + .fluidInputs(fluid('oxygen') * 9000) + .outputs(metaitem('dustAntimonyTrioxide') * 5) + .fluidOutputs(fluid('sulfur_dioxide') * 3000) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustStibnite')) + .fluidInputs(fluid('oxygen') * 9000) + .outputs(metaitem('dustAntimonyTrioxide') * 5) + .fluidOutputs(fluid('sulfur_dioxide') * 3000) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + +EBF.recipeBuilder() + .inputs(ore('dustStibnite')) + .fluidInputs(fluid('oxygen') * 6000) + .outputs(metaitem('ingotAntimony') * 2) + .fluidOutputs(fluid('sulfur_dioxide') * 3000) + .EUt(Globals.voltAmps[2] * 2) + .duration(200) + .buildAndRegister() + +EBF.recipeBuilder() + .inputs(ore('dustAntimonyIiiSulfide') * 5) + .fluidInputs(fluid('oxygen') * 6000) + .outputs(metaitem('ingotAntimony') * 2) + .fluidOutputs(fluid('sulfur_dioxide') * 3000) + .EUt(Globals.voltAmps[2] * 2) + .duration(200) + .buildAndRegister() + +// TETRAHEDRITE PROCESSING + +BR.recipeBuilder() + .notConsumable(ore('springCupronickel')) + .inputs(ore('dustTetrahedrite') * 4) + .inputs(ore('dustSodiumSulfide') * 18) + .fluidInputs(fluid('gtfo_heated_water') * 12000) + .outputs(metaitem('dustCopperISulfide') * 15) + .outputs(metaitem('dustCopperIiSulfide') * 4) + .fluidOutputs(fluid('sodium_thioantimonite_solution') * 12000) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + +BR.recipeBuilder() + .fluidInputs(fluid('sodium_thioantimonite_solution') * 12000) + .fluidInputs(fluid('hydrochloric_acid') * 12000) + .outputs(metaitem('dustAntimonyIiiSulfide') * 10) + .fluidOutputs(fluid('diluted_saltwater') * 24000) + .fluidOutputs(fluid('hydrogen_sulfide') * 6000) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + +// FROM LEAD (KROLL-BETTERTON PROCESS) BR.recipeBuilder() .fluidInputs(fluid('antimony_dross') * 720) @@ -13,13 +125,41 @@ BR.recipeBuilder() .duration(200) .buildAndRegister() +// FROM LEAD (ANODE SLIME) + ROASTER.recipeBuilder() - .inputs(ore('dustAntimonyIiiSulfide') * 5) - .inputs(ore('dustAnyPurityCarbon') * 3) - .fluidInputs(fluid('oxygen') * 6000) - .outputs(metaitem('dustAntimony') * 2) - .fluidOutputs(fluid('carbon_monoxide') * 3000) - .fluidOutputs(fluid('sulfur_dioxide') * 3000) + .inputs(ore('dustAntimonyArsenicFlueDust') * 5) + .inputs(ore('dustSodiumHydroxide') * 54) + .outputs(metaitem('dustAntimony') * 4) + .outputs(metaitem('dustSodiumArsenate') * 48) + .fluidOutputs(fluid('steam') * 9000) .EUt(Globals.voltAmps[2]) .duration(200) .buildAndRegister() + +// REFINING + +VACUUM_DT.recipeBuilder() + .fluidInputs(fluid('antimony_trichloride') * 1000) + .fluidOutputs(fluid('purified_antimony_trichloride') * 1000) + .EUt(Globals.voltAmps[2]) + .duration(200) + .buildAndRegister() + +BR.recipeBuilder() + .fluidInputs(fluid('purified_antimony_trichloride') * 2000) + .fluidInputs(fluid('ultrapure_water') * 6000) + .outputs(metaitem('dustPurifiedAntimonyTrioxide') * 5) + .fluidOutputs(fluid('hydrochloric_acid') * 3000) + .EUt(Globals.voltAmps[2]) + .duration(400) + .buildAndRegister() + +REACTION_FURNACE.recipeBuilder() + .inputs(ore('dustPurifiedAntimonyTrioxide') * 5) + .fluidInputs(fluid('hydrogen') * 6000) + .outputs(metaitem('dustHighPurityAntimony') * 2) + .fluidOutputs(fluid('steam') * 3000) + .EUt(Globals.voltAmps[2]) + .duration(400) + .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy index 3fc3573aa..476f87322 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy @@ -19,6 +19,34 @@ ROASTER = recipemap('roaster') DISTILLERY = recipemap('distillery') DT = recipemap('distillation_tower') +//BENEFICIATION + +MIXER.recipeBuilder() + .inputs(ore('dustImpureArsenopyrite') * 8) + .fluidInputs(fluid('distilled_water') * 2000) + .fluidOutputs(fluid('impure_arsenopyrite_slurry') * 2000) + .EUt(Globals.voltAmps[3]) + .duration(80) + .buildAndRegister() + +FLOTATION.recipeBuilder() + .fluidInputs(fluid('impure_arsenopyrite_slurry') * 2000) + .notConsumable(metaitem('dustSodiumEthylXanthate')) + .notConsumable(metaitem('dustPotassiumPermanganate') * 6) + .fluidOutputs(fluid('arsenopyrite_slurry') * 1000) + .fluidOutputs(fluid('pyrite_slurry') * 1000) + .EUt(Globals.voltAmps[3]) + .duration(80) + .buildAndRegister() + +CLARIFIER.recipeBuilder() + .fluidInputs(fluid('arsenopyrite_slurry') * 1000) + .outputs(metaitem('dustArsenopyrite') * 16) + .fluidOutputs(fluid('wastewater') * 1000) + .EUt(Globals.voltAmps[1]) + .duration(20) + .buildAndRegister() + //ROAST RECOVERY OF As2O3 (75% EFFICIENCY) //COBALTITE MODIFICATION mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustCobaltite')], [fluid('oxygen') * 3000]) @@ -68,7 +96,19 @@ EBF.recipeBuilder() .EUt(Globals.voltAmps[2]) .buildAndRegister() -//NOTE: ENARGITE AND PROUSTITE CANNOT BE PYROMETALLURGICALLY TREATED TO FORM SIGNIFICANT QUANTITES OF ARSENIC TRIOXIDE. +//ENARGITE SMELTING +EBF.recipeBuilder() + .inputs(ore('dustEnargite') * 2) + .fluidInputs(fluid('oxygen') * 19000) + .outputs(metaitem('ingotBlisterCopper')) + .outputs(metaitem('dustArsenicTrioxide') * 5) + .fluidOutputs(fluid('sulfur_dioxide') * 8000) + .blastFurnaceTemp(1200) + .EUt(480) + .duration(40) + .buildAndRegister() + +//NOTE: PROUSTITE CANNOT BE PYROMETALLURGICALLY TREATED TO FORM SIGNIFICANT QUANTITES OF ARSENIC TRIOXIDE. //ARSENOPYRITE AND COBALTITE ACID LEACHING def tab_MAsS = ["Cobaltite", "Arsenopyrite"] @@ -107,7 +147,7 @@ for (ore in tab_MAsS) { ROASTER.recipeBuilder() .fluidInputs(fluid('acidic_arsenate_v_solution') * 2000) .outputs(metaitem('dustArsenicVOxide') * 21) - .fluidOutputs(fluid('steam') * 15000) + .fluidOutputs(fluid('dense_steam') * 15000) .fluidOutputs(fluid('nitrogen_dioxide') * 12000) .fluidOutputs(fluid('oxygen') * 6000) .duration(120) @@ -331,7 +371,7 @@ BATCH_REACTOR.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('acidic_copper_solution') * 2000) .outputs(metaitem('dustCopperSulfate') * 24) - .fluidOutputs(fluid('steam') * (8000 + 2000)) + .fluidOutputs(fluid('dense_steam') * (8000 + 2000)) .fluidOutputs(fluid('oxygen') * 1000) .fluidOutputs(fluid('nitrogen_dioxide') * 4000) .duration(120) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/PhosphorusChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/PhosphorusChain.groovy index 91d7f315a..0cfc8f1af 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/PhosphorusChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/PhosphorusChain.groovy @@ -38,7 +38,7 @@ BATCH_REACTOR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustMonocalciumPhosphate') * 15) .outputs(metaitem('dustCalciumPhosphite') * 11) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .duration(120) .EUt(Globals.voltAmps[1]) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SeleniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SeleniumChain.groovy index 9757e4bc1..4fa7091e3 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SeleniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SeleniumChain.groovy @@ -34,7 +34,7 @@ MIXER.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('copper_anode_slime_paste') * 1000) .outputs(metaitem('dustSeleniumTelluriumConcentrate')) // 0.75 Na2SeO4, 0.25 Na2TeO4, 2 Ag/Au - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .duration(600) .EUt(120) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group18/AirDistillation.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group18/AirDistillation.groovy index 163381f3b..10ba70b49 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group18/AirDistillation.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group18/AirDistillation.groovy @@ -15,6 +15,7 @@ FBR = recipemap('fixed_bed_reactor') SINTERING_OVEN = recipemap('sintering_oven') CENTRIFUGE = recipemap('centrifuge') FLUID_HEATER = recipemap('fluid_heater') +DT = recipemap('distillation_tower') //TIER ONE (OXYGEN + NITROGEN) @@ -56,19 +57,19 @@ CONTACT_COOLER.recipeBuilder() //CO2 REMOVAL SIFTER.recipeBuilder() - .inputs(ore('dustTinyMolecularSieve')) + .inputs(ore('dustMolecularSieve')) .fluidInputs(fluid('air') * 12000) .fluidOutputs(fluid('decarburized_air') * 12000) - .outputs(metaitem('dustTinyDirtyMolecularSieve')) + .outputs(metaitem('dustDirtyMolecularSieve')) .duration(4) .EUt(Globals.voltAmps[3]) .buildAndRegister() //VACUUM REHEATING FOR REGENERATION VACUUM_CHAMBER.recipeBuilder() - .inputs(ore('dustTinyDirtyMolecularSieve')) + .inputs(ore('dustDirtyMolecularSieve')) .notConsumable(metaitem('springKanthal')) - .outputs(metaitem('dustTinyMolecularSieve')) + .outputs(metaitem('dustMolecularSieve')) .fluidOutputs(fluid('carbon_dioxide') * 20) .duration(4) .EUt(Globals.voltAmps[1]) @@ -82,6 +83,34 @@ HEAT_EXCHANGER.recipeBuilder() .duration(1) .buildAndRegister() +//NETHER AIR PROCESSING +SIFTER.recipeBuilder() + .inputs(ore('dustMolecularSieve')) + .fluidInputs(fluid('nether_air') * 14000) + .fluidOutputs(fluid('decarburized_air') * 12000) + .outputs(metaitem('dustNetherMolecularSieve')) + .duration(4) + .EUt(Globals.voltAmps[3]) + .buildAndRegister() + +VACUUM_CHAMBER.recipeBuilder() + .inputs(ore('dustNetherMolecularSieve')) + .notConsumable(metaitem('springKanthal')) + .outputs(metaitem('dustMolecularSieve')) + .fluidOutputs(fluid('heavy_nether_gases') * 2000) + .duration(4) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() + +DT.recipeBuilder() + .fluidInputs(fluid('heavy_nether_gases') * 2000) + .fluidOutputs(fluid('sulfur_dioxide') * 500) + .fluidOutputs(fluid('hydrogen_sulfide') * 500) + .fluidOutputs(fluid('carbon_dioxide') * 1000) + .duration(100) + .EUt(64) + .buildAndRegister() + //SIDESTREAM OF BOOSTED AIR FOR COLD GENERATION /*FLUID_COMPRESSOR.recipeBuilder() .fluidInputs(fluid('purified_air') * 1000) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/DeuteriumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/DeuteriumChain.groovy index 686641b0d..e4e2a69d1 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/DeuteriumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/DeuteriumChain.groovy @@ -25,7 +25,7 @@ LCR.recipeBuilder().EUt(480).duration(200) .fluidInputs(fluid('impure_semiheavy_hydrogen_sulfide') * 2000) .fluidInputs(fluid('impure_semiheavy_water') * 1000) .fluidOutputs(fluid('semiheavy_hydrogen_sulfide') * 2000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .circuitMeta(2) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/LithiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/LithiumChain.groovy index d8fc7eca5..0d4c2ddb4 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/LithiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/LithiumChain.groovy @@ -155,7 +155,7 @@ ROASTER.recipeBuilder() .fluidInputs(fluid('hydrochloric_acid') * 2000) .inputs(ore('dustLithiumCarbonate') * 6) .outputs(metaitem('dustLithiumChloride') * 4) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .fluidOutputs(fluid('carbon_dioxide') * 1000) .duration(180) .EUt(200) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/PotassiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/PotassiumChain.groovy index af6d7763f..b6c6e4828 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/PotassiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/PotassiumChain.groovy @@ -159,7 +159,7 @@ ELECTROLYTIC_CELL.recipeBuilder() .inputs(ore('dustPotassiumHydroxide') * 6) .outputs(metaitem('dustPotassium') * 2) .fluidOutputs(fluid('oxygen') * 1000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(600) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/SodiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/SodiumChain.groovy index f711fa72a..d708d2610 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/SodiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/SodiumChain.groovy @@ -8,7 +8,7 @@ BR = recipemap('batch_reactor') ROASTER.recipeBuilder() .inputs(ore('dustTrona') * 28) .outputs(metaitem('dustSodaAsh') * 18) - .fluidOutputs(fluid('steam') * 5000) + .fluidOutputs(fluid('dense_steam') * 5000) .fluidOutputs(fluid('carbon_dioxide') * 1000) .EUt(30) .duration(120) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/BerylliumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/BerylliumChain.groovy index 28a290b9b..67b119902 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/BerylliumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/BerylliumChain.groovy @@ -137,7 +137,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustBerylliumHydroxide') * 5) .outputs(metaitem('dustBerylliumOxide') * 2) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(Globals.voltAmps[4]) .duration(80) .buildAndRegister() @@ -244,7 +244,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .fluidInputs(fluid('ammonium_fluoroberyllate_solution') * 1000) .outputs(metaitem('dustAmmoniumFluoroberyllate') * 13) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[2]) .duration(100) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/CalciumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/CalciumChain.groovy index ab8d81a4e..7463ccab1 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/CalciumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/CalciumChain.groovy @@ -7,7 +7,7 @@ VACUUM_DT = recipemap('vacuum_distillation') ROASTER.recipeBuilder() .inputs(ore('dustGypsum') * 8) .outputs(metaitem('dustCalciumSulfate') * 6) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .EUt(30) .duration(160) .buildAndRegister() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy index 372ca8cdc..29c22a31a 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy @@ -139,7 +139,7 @@ ROASTER.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustKieserite') * 7) .outputs(metaitem('dustMagnesiumSulfate') * 6) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .EUt(30) .duration(160) .buildAndRegister() diff --git a/groovy/postInit/chemistry/organic_chemistry/AlcoholChain.groovy b/groovy/postInit/chemistry/organic_chemistry/AlcoholChain.groovy index 7d6158f17..4175688e2 100644 --- a/groovy/postInit/chemistry/organic_chemistry/AlcoholChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/AlcoholChain.groovy @@ -40,7 +40,7 @@ FBR.recipeBuilder() .fluidInputs(fluid('hot_hp_hydrogen') * 300) .notConsumable(metaitem('dustImpregnatedCopperOxideCatalyst') * 1) .fluidOutputs(fluid('methanol') * 50) - .fluidOutputs(fluid('steam') * 50) + .fluidOutputs(fluid('dense_steam') * 50) .duration(8) .EUt(480) .buildAndRegister() @@ -50,7 +50,7 @@ FBR.recipeBuilder() .fluidInputs(fluid('carbon_dioxide') * 50) .notConsumable(metaitem('dustImpregnatedCopperOxideCatalyst') * 1) .fluidOutputs(fluid('methanol') * 200) - .fluidOutputs(fluid('steam') * 50) + .fluidOutputs(fluid('dense_steam') * 50) .duration(24) .EUt(480) .buildAndRegister() diff --git a/groovy/postInit/chemistry/organic_chemistry/Extractants.groovy b/groovy/postInit/chemistry/organic_chemistry/Extractants.groovy index c6f7f8147..b981b4a74 100755 --- a/groovy/postInit/chemistry/organic_chemistry/Extractants.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/Extractants.groovy @@ -167,7 +167,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('coconut_acid') * 1000) .fluidInputs(fluid('ammonia') * 1000) .fluidOutputs(fluid('coco_amine') * 1000) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .EUt(30) .duration(200) .buildAndRegister() @@ -353,7 +353,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('diethylenetriamine') * 1000) .fluidInputs(fluid('caprylic_acid') * 2000) .fluidOutputs(fluid('one_amidoethyl_two_alkyl_two_imidazoline') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[4]) .duration(80) .buildAndRegister() @@ -362,7 +362,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('diethylenetriamine') * 1000) .fluidInputs(fluid('lauric_acid') * 2000) .fluidOutputs(fluid('one_amidoethyl_two_alkyl_two_imidazoline') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[4]) .duration(80) .buildAndRegister() @@ -371,7 +371,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('diethylenetriamine') * 1000) .fluidInputs(fluid('palmitic_acid') * 2000) .fluidOutputs(fluid('one_amidoethyl_two_alkyl_two_imidazoline') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[4]) .duration(80) .buildAndRegister() @@ -380,7 +380,7 @@ REACTION_FURNACE.recipeBuilder() .fluidInputs(fluid('diethylenetriamine') * 1000) .fluidInputs(fluid('stearic_acid') * 2000) .fluidOutputs(fluid('one_amidoethyl_two_alkyl_two_imidazoline') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .EUt(Globals.voltAmps[4]) .duration(80) .buildAndRegister() diff --git a/groovy/postInit/chemistry/organic_chemistry/PhthalateDerivatives.groovy b/groovy/postInit/chemistry/organic_chemistry/PhthalateDerivatives.groovy index cbfb22dbf..c1d2fdbed 100755 --- a/groovy/postInit/chemistry/organic_chemistry/PhthalateDerivatives.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/PhthalateDerivatives.groovy @@ -23,7 +23,7 @@ FLUIDIZEDBR.recipeBuilder() .fluidInputs(fluid('ortho_xylene') * 1000) .fluidInputs(fluid('oxygen') * 6000) .notConsumable(ore('dustVanadiumPentoxide')) -.fluidOutputs(fluid('steam') * 3000) +.fluidOutputs(fluid('dense_steam') * 3000) .outputs(metaitem('dustPhthalicAnhydride') * 13) .duration(300) .EUt(240) diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy index 19f6f4e2f..71f99f732 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy @@ -460,10 +460,8 @@ def getUniquePairs(Map materialsMap) { // Cetane-Boosted Diesel * 750 mods.gregtech.mixer.removeByInput(480, null, [fluid('bio_diesel') * 1000, fluid('tetranitromethane') * 40]) -mods.gregtech.blender.removeByInput(480, null, [fluid('bio_diesel') * 1000, fluid('tetranitromethane') * 40]) // Cetane-Boosted Diesel * 1000 mods.gregtech.mixer.removeByInput(480, null, [fluid('diesel') * 1000, fluid('tetranitromethane') * 20]) -mods.gregtech.blender.removeByInput(480, null, [fluid('diesel') * 1000, fluid('tetranitromethane') * 20]) for (major_solvent in major_solvents) { for (minor_solvent in minor_solvents) { BLENDER.recipeBuilder() @@ -593,7 +591,7 @@ for (pair in oxygenatePairs) { .buildAndRegister() } -println("Registered oxygenate pairs") +log.infoMC("Registered oxygenate pairs") // Gasoline final blending diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy index ddfe0dcb8..5dc40dce8 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy @@ -285,7 +285,7 @@ PHASE_SEPARATOR = recipemap('phase_separator') ROASTER.recipeBuilder() .inputs(ore('dustTrimelliticAcid') * 21) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .outputs(metaitem('dustTrimelliticAnhydride') * 18) .EUt(120) .duration(100) @@ -644,7 +644,7 @@ PHASE_SEPARATOR = recipemap('phase_separator') .fluidInputs(fluid('butane') * 1000) .fluidInputs(fluid('oxygen') * 7000) .notConsumable(ore('dustVanadiumPentoxide')) - .fluidOutputs(fluid('steam') * 4000) + .fluidOutputs(fluid('dense_steam') * 4000) .outputs(metaitem('dustMaleicAnhydride') * 9) .duration(200) .EUt(240) diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/AramidChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/AramidChain.groovy index c3460c5e5..8a926b9c4 100755 --- a/groovy/postInit/chemistry/organic_chemistry/polymers/AramidChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/polymers/AramidChain.groovy @@ -52,7 +52,7 @@ BCR.recipeBuilder() DISTILLATION_TOWER.recipeBuilder() .fluidInputs(fluid('para_phenylenediamine_solution') * 3000) .fluidOutputs(fluid('toluene') * 1000) - .fluidOutputs(fluid('steam') * 2000) + .fluidOutputs(fluid('dense_steam') * 2000) .outputs(metaitem('dustParaPhenylenediamine') * 16) .duration(200) .EUt(30) diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/PolystyreneChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/PolystyreneChain.groovy index 265d4d666..f926bddf7 100755 --- a/groovy/postInit/chemistry/organic_chemistry/polymers/PolystyreneChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/polymers/PolystyreneChain.groovy @@ -11,7 +11,7 @@ POLYMERIZATION = recipemap('polymerization_tank') FBR.recipeBuilder() .fluidInputs(fluid('ethylbenzene') * 50) - .fluidInputs(fluid('steam') * 50) + .fluidInputs(fluid('dense_steam') * 50) .notConsumable(ore('catalystBedIronIiiOxide')) .fluidOutputs(fluid('crude_styrene') * 50) .fluidOutputs(fluid('hydrogen') * 90) diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy index 7d413f61b..f915c5a64 100755 --- a/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy @@ -63,7 +63,7 @@ FBR.recipeBuilder() .fluidInputs(fluid('ethanolamine') * 3000) .outputs(metaitem('dustTriethylenediamine') * 8) .fluidOutputs(fluid('ammonia') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .duration(200) .EUt(240) .buildAndRegister() diff --git a/groovy/postInit/components/Batteries.groovy b/groovy/postInit/components/Batteries.groovy index bcb42cc9a..b4b6469a8 100644 --- a/groovy/postInit/components/Batteries.groovy +++ b/groovy/postInit/components/Batteries.groovy @@ -117,7 +117,7 @@ CSTR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustLithiumCarbonate') * 6) .fluidInputs(fluid('hydrogen_fluoride') * 2000) - .fluidOutputs(fluid('steam') * 1000) + .fluidOutputs(fluid('dense_steam') * 1000) .fluidOutputs(fluid('carbon_dioxide') * 1000) .outputs(metaitem('dustLithiumFluoride') * 4) .duration(140) diff --git a/groovy/postInit/components/Photomasks.groovy b/groovy/postInit/components/Photomasks.groovy index 4263b77ce..671948a67 100644 --- a/groovy/postInit/components/Photomasks.groovy +++ b/groovy/postInit/components/Photomasks.groovy @@ -56,7 +56,7 @@ UV_LIGHT_BOX = recipemap('uv_light_box') .fluidInputs(fluid('propene') * 50) .fluidInputs(fluid('oxygen') * 100) .fluidOutputs(fluid('acrolein') * 50) - .fluidOutputs(fluid('steam') * 50) + .fluidOutputs(fluid('dense_steam') * 50) .duration(8) .EUt(120) .buildAndRegister() @@ -78,7 +78,7 @@ BR.recipeBuilder() .inputs(ore('dustTrimethylolpropane')) .fluidInputs(fluid('acrylic_acid') * 3000) .fluidOutputs(fluid('trimethylolpropane_triacrylate') * 1000) - .fluidOutputs(fluid('steam') * 3000) + .fluidOutputs(fluid('dense_steam') * 3000) .duration(200) .EUt(120) .buildAndRegister() diff --git a/groovy/postInit/components/SMDComponents.groovy b/groovy/postInit/components/SMDComponents.groovy index eebb845e4..3b28c7fd9 100644 --- a/groovy/postInit/components/SMDComponents.groovy +++ b/groovy/postInit/components/SMDComponents.groovy @@ -73,7 +73,6 @@ mods.gregtech.assembler.removeByInput(480, [metaitem('dustGalliumArsenide'), met // Ferrite Mixture Dust * 6 mods.gregtech.mixer.removeByInput(120, [metaitem('dustNickel'), metaitem('dustZinc'), metaitem('dustIron') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 2])], null) -mods.gregtech.blender.removeByInput(120, [metaitem('dustNickel'), metaitem('dustZinc'), metaitem('dustIron') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 2])], null) // Nickel Zinc Ferrite Ingot * 1 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustFerriteMixture')], [fluid('oxygen') * 2000]) diff --git a/groovy/postInit/components/Superconductors.groovy b/groovy/postInit/components/Superconductors.groovy index f114c8347..d19236eb2 100644 --- a/groovy/postInit/components/Superconductors.groovy +++ b/groovy/postInit/components/Superconductors.groovy @@ -16,16 +16,12 @@ for(name in recipesToRemove) { // Mercury Barium Calcium Cuprate Dust * 16 mods.gregtech.mixer.removeByInput(120, [metaitem('dustBarium') * 2, metaitem('dustCalcium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('mercury') * 1000, fluid('oxygen') * 8000]) -mods.gregtech.blender.removeByInput(120, [metaitem('dustBarium') * 2, metaitem('dustCalcium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('mercury') * 1000, fluid('oxygen') * 8000]) // Samarium Iron Arsenic Oxide Dust * 4 mods.gregtech.mixer.removeByInput(7680, [metaitem('dustSamarium'), metaitem('dustIron'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 1000]) -mods.gregtech.blender.removeByInput(7680, [metaitem('dustSamarium'), metaitem('dustIron'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 1000]) // Yttrium Barium Cuprate Dust * 13 mods.gregtech.mixer.removeByInput(1920, [metaitem('dustYttrium'), metaitem('dustBarium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 7000]) -mods.gregtech.blender.removeByInput(1920, [metaitem('dustYttrium'), metaitem('dustBarium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 7000]) // Indium Tin Barium Titanium Cuprate Dust * 16 mods.gregtech.mixer.removeByInput(30720, [metaitem('dustIndium') * 4, metaitem('dustTin') * 2, metaitem('dustBarium') * 2, metaitem('dustTitanium'), metaitem('dustCopper') * 7, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 14000]) -mods.gregtech.blender.removeByInput(30720, [metaitem('dustIndium') * 4, metaitem('dustTin') * 2, metaitem('dustBarium') * 2, metaitem('dustTitanium'), metaitem('dustCopper') * 7, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 14000]) // Hot Mercury Barium Calcium Cuprate Ingot * 1 mods.gregtech.electric_blast_furnace.removeByInput(480, [metaitem('dustMercuryBariumCalciumCuprate'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('nitrogen') * 1000]) @@ -418,7 +414,7 @@ BR.recipeBuilder() ROASTER.recipeBuilder() .inputs(ore('dustIndiumHydroxide') * 14) .outputs(metaitem('dustIndiumOxide') * 5) - .fluidOutputs(liquid('steam') * 3000) + .fluidOutputs(liquid('dense_steam') * 3000) .duration(200) .EUt(120) .buildAndRegister(); diff --git a/groovy/postInit/gameplay/StartingAge.groovy b/groovy/postInit/gameplay/StartingAge.groovy index 64bbe8875..d7cf1af9a 100644 --- a/groovy/postInit/gameplay/StartingAge.groovy +++ b/groovy/postInit/gameplay/StartingAge.groovy @@ -6,7 +6,7 @@ import appeng.api.features.IGrinderRecipeBuilder; final IGrinderRegistry reg = AEApi.instance().registries().grinder(); -println("Running StartingAge.groovy...") +log.infoMC("Running StartingAge.groovy...") def name_removals = [ "notreepunching:tools/iron_saw", diff --git a/groovy/postInit/metallurgy/OreSorting.groovy b/groovy/postInit/metallurgy/OreSorting.groovy index 2e28257cb..e3835b9ac 100644 --- a/groovy/postInit/metallurgy/OreSorting.groovy +++ b/groovy/postInit/metallurgy/OreSorting.groovy @@ -1,7 +1,7 @@ import classes.* import globals.Globals -println("Running OreSorting.groovy...") +log.infoMC("Running OreSorting.groovy...") int fluid_amount = 100; diff --git a/groovy/postInit/metallurgy/Solders.groovy b/groovy/postInit/metallurgy/Solders.groovy new file mode 100644 index 000000000..25490baf5 --- /dev/null +++ b/groovy/postInit/metallurgy/Solders.groovy @@ -0,0 +1,51 @@ +import globals.Globals + +EBF = recipemap('electric_blast_furnace') +MIXER = recipemap('mixer') +ALLOY_SMELTER = recipemap('alloy_smelter') + +ALLOY_SMELTER.recipeBuilder() + .inputs(ore('dustBismuth') * 6) + .inputs(ore('dustTin') * 4) + .outputs(metaitem('ingotLeadFreeSolder') * 10) + .duration(120) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + +ALLOY_SMELTER.recipeBuilder() + .inputs(ore('dustBismuth') * 6) + .inputs(ore('ingotTin') * 4) + .outputs(metaitem('ingotLeadFreeSolder') * 10) + .duration(120) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + +ALLOY_SMELTER.recipeBuilder() + .inputs(ore('ingotBismuth') * 6) + .inputs(ore('dustTin') * 4) + .outputs(metaitem('ingotLeadFreeSolder') * 10) + .duration(120) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + +ALLOY_SMELTER.recipeBuilder() + .inputs(ore('ingotBismuth') * 6) + .inputs(ore('ingotTin') * 4) + .outputs(metaitem('ingotLeadFreeSolder') * 10) + .duration(120) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + +MIXER.recipeBuilder() + .inputs(ore('dustIndium') * 3) + .inputs(ore('dustTinySilver')) + .outputs(metaitem('dustCryogenicSolder') * 3) + .duration(120) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + +crafting.addShaped("susy:cryogenic_solder", metaitem('dustCryogenicSolder') * 3, [ + [ore('dustIndium'), ore('dustIndium'), ore('dustIndium')], + [ore('dustTinySilver'), null, null], + [null, null, null] +]) \ No newline at end of file diff --git a/groovy/postInit/metallurgy/StainlessSteelChain.groovy b/groovy/postInit/metallurgy/StainlessSteelChain.groovy index b417ca4c4..509166a79 100644 --- a/groovy/postInit/metallurgy/StainlessSteelChain.groovy +++ b/groovy/postInit/metallurgy/StainlessSteelChain.groovy @@ -8,10 +8,8 @@ import static gregtech.api.unification.ore.OrePrefix.dye; //REMOVE OLD RECIPES // Stainless Steel Dust * 9 mods.gregtech.mixer.removeByInput(120, [metaitem('dustIron') * 6, metaitem('dustNickel'), metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 3])], null) -mods.gregtech.blender.removeByInput(120, [metaitem('dustIron') * 6, metaitem('dustNickel'), metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 3])], null) // Stainless Steel Dust * 9 mods.gregtech.mixer.removeByInput(120, [metaitem('dustIron') * 4, metaitem('dustInvar') * 3, metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(120, [metaitem('dustIron') * 4, metaitem('dustInvar') * 3, metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) EBF = recipemap('electric_blast_furnace') MIXER = recipemap('mixer') diff --git a/groovy/postInit/misc/CementChain.groovy b/groovy/postInit/misc/CementChain.groovy index 19a17af2b..5a826c419 100755 --- a/groovy/postInit/misc/CementChain.groovy +++ b/groovy/postInit/misc/CementChain.groovy @@ -156,13 +156,10 @@ for (int i = 0; i < 16; i++) { //REMOVALS OF DEFAULT RECIPES // Concrete * 576 mods.gregtech.mixer.removeByInput(16, [metaitem('dustClay'), metaitem('dustStone') * 3], [fluid('water') * 500]) -mods.gregtech.blender.removeByInput(16, [metaitem('dustClay'), metaitem('dustStone') * 3], [fluid('water') * 500]) // Concrete * 1152 mods.gregtech.mixer.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustCalcite'), metaitem('dustGypsum')], [fluid('water') * 1000]) -mods.gregtech.blender.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustCalcite'), metaitem('dustGypsum')], [fluid('water') * 1000]) // Concrete * 1152 mods.gregtech.mixer.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustMarble'), metaitem('dustGypsum')], [fluid('water') * 1000]) -mods.gregtech.blender.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustMarble'), metaitem('dustGypsum')], [fluid('water') * 1000]) def name_removals = [ 'minecraft:white_concrete_powder', @@ -191,7 +188,6 @@ for (name in name_removals) { for (dye in dyes) { // Concrete Powder * 8 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sand') * 4, item('minecraft:gravel') * 4], [fluid(dye) * 144]) - mods.gregtech.blender.removeByInput(7, [item('minecraft:sand') * 4, item('minecraft:gravel') * 4], [fluid(dye) * 144]) } for (int i = 0; i < 16; i++) { diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 8706e4e6d..a41065131 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -16,7 +16,7 @@ import supersymmetry.api.capability.impl.PseudoMultiRecipeLogic; import supersymmetry.api.recipes.builders.PseudoMultiRecipeBuilder; import net.minecraft.init.Blocks; -println("Running GregTech.groovy...") +log.infoMC("Running GregTech.groovy...") //REMOVALS @@ -26,7 +26,6 @@ mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustCoal')], null) mods.gregtech.extractor.removeByInput(64, [metaitem('dustMonazite')], null) // Graphene Dust * 1 mods.gregtech.mixer.removeByInput(480, [metaitem('dustGraphite'), metaitem('dustSilicon'), metaitem('dustCarbon') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(480, [metaitem('dustGraphite'), metaitem('dustSilicon'), metaitem('dustCarbon') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) // Wrought Iron Ingot * 2 mods.gregtech.electric_blast_furnace.removeByInput(480, [metaitem('dustIlmenite') * 10, metaitem('dustCarbon') * 4], null) // Stone Slab * 2 @@ -53,7 +52,6 @@ mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:turbine_casing', 5)] mods.gregtech.macerator.removeByInput(8, [item('gregtech:turbine_casing', 5)], null) // Gelatin Mixture * 4000 mods.gregtech.mixer.removeByInput(480, [metaitem('dustCollagen') * 4], [fluid('phosphoric_acid') * 1000, fluid('water') * 3000]) -mods.gregtech.blender.removeByInput(480, [metaitem('dustCollagen') * 4], [fluid('phosphoric_acid') * 1000, fluid('water') * 3000]) // Phosphorus Dust * 1 mods.gregtech.centrifuge.removeByInput(480, null, [fluid('gelatin_mixture') * 6000]) // Reservoir Hatch * 1 @@ -843,7 +841,6 @@ LATEX_COLLECTOR.recipeBuilder() //TODO: ADD GRAVITY SEPARATOR STUFF // Construction Foam * 8000 mods.gregtech.mixer.removeByInput(16, [metaitem('dustRawRubber')], [fluid('concrete') * 576]) -mods.gregtech.blender.removeByInput(16, [metaitem('dustRawRubber')], [fluid('concrete') * 576]) MIXER.recipeBuilder() .inputs(ore('dustRubber')) diff --git a/groovy/postInit/mod/GregTechFoodOption.groovy b/groovy/postInit/mod/GregTechFoodOption.groovy index c0b11d291..d79888c76 100755 --- a/groovy/postInit/mod/GregTechFoodOption.groovy +++ b/groovy/postInit/mod/GregTechFoodOption.groovy @@ -550,5 +550,3 @@ mods.gregtech.lathe.removeByInput(30, [metaitem('stickSteel')], null) // Skewer * 8 mods.gregtech.lathe.removeByInput(40, [metaitem('stickStainlessSteel')], null) -// Baking Soda Solution * 1000 -mods.gregtech.blender.removeByInput(8, [metaitem('dustSodiumBicarbonate')], [fluid('water') * 1000]) diff --git a/groovy/postInit/mod/ImmersiveRailroading.groovy b/groovy/postInit/mod/ImmersiveRailroading.groovy index 215b85920..396d64f91 100755 --- a/groovy/postInit/mod/ImmersiveRailroading.groovy +++ b/groovy/postInit/mod/ImmersiveRailroading.groovy @@ -1,4 +1,4 @@ -println("Running ImmersiveRailroading.groovy...") +log.infoMC("Running ImmersiveRailroading.groovy...") import globals.Globals import supersymmetry.api.recipes.SuSyRecipeMaps; diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index eeedbfc80..0956d7f69 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -906,7 +906,7 @@ crafting.addShaped("gregtech:bath_condenser", metaitem('bath_condenser'), [ // Phase Separator -crafting.addShaped("gregtech:phase_separator", metaitem('phase_separator.lv'), [ +crafting.addShaped("gregtech:phase_separator", metaitem('phase_separator'), [ [metaitem('frameStainlessSteel'), metaitem('drum.stainless_steel'), metaitem('pipeSmallFluidStainlessSteel')], [metaitem('pipeSmallFluidStainlessSteel'), metaitem('hull.hv'), metaitem('pipeSmallFluidStainlessSteel')], [null, null, null] @@ -1038,6 +1038,7 @@ recipemap('assembler').recipeBuilder() .inputs(metaitem('electric.pump.hv') * 4) .inputs(ore('plateAluminium') * 4) .inputs(metaitem('mineral_wool') * 64) + .fluidInputs(fluid('cryogenic_solder') * 1296) .outputs(metaitem('single_column_cryogenic_distillation_plant')) .EUt(30) .duration(600) @@ -1052,6 +1053,7 @@ recipemap('assembler').recipeBuilder() .inputs(ore('plateAluminium') * 4) .inputs(item('susy:serpentine') * 6) .inputs(metaitem('mineral_wool') * 64) + .fluidInputs(fluid('cryogenic_solder') * 1296) .outputs(metaitem('low_pressure_cryogenic_distillation_plant')) .EUt(30) .duration(600) @@ -1065,6 +1067,7 @@ recipemap('assembler').recipeBuilder() .inputs(metaitem('electric.pump.hv') * 8) .inputs(ore('plateAluminium') * 4) .inputs(metaitem('mineral_wool') * 64) + .fluidInputs(fluid('cryogenic_solder') * 1296) .outputs(metaitem('high_pressure_cryogenic_distillation_plant')) .EUt(30) .duration(600) diff --git a/groovy/postInit/mod/Radiation.groovy b/groovy/postInit/mod/Radiation.groovy index b1ab661ce..ce252aaaa 100644 --- a/groovy/postInit/mod/Radiation.groovy +++ b/groovy/postInit/mod/Radiation.groovy @@ -1,7 +1,7 @@ /* import nc.radiation.RadSources; -println("Running Radiation.groovy...") +log.infoMC("Running Radiation.groovy...") private void addRadiationToDusts (String materialName, double baseRadiation){ RadSources.addToStackMap(metaitem("dust" + materialName), baseRadiation); diff --git a/groovy/postInit/mod/VanillaRecipes.groovy b/groovy/postInit/mod/VanillaRecipes.groovy index 9f1e1db05..9c0690152 100755 --- a/groovy/postInit/mod/VanillaRecipes.groovy +++ b/groovy/postInit/mod/VanillaRecipes.groovy @@ -584,13 +584,10 @@ mods.gregtech.macerator.recipeBuilder() //Mixer // Fermented Spider Eye * 1 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sugar'), item('minecraft:red_mushroom'), item('minecraft:spider_eye')], null) -mods.gregtech.blender.removeByInput(7, [item('minecraft:sugar'), item('minecraft:red_mushroom'), item('minecraft:spider_eye')], null) // Fermented Spider Eye * 1 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sugar'), item('minecraft:brown_mushroom'), item('minecraft:spider_eye')], null) -mods.gregtech.blender.removeByInput(7, [item('minecraft:sugar'), item('minecraft:brown_mushroom'), item('minecraft:spider_eye')], null) // Fire Charge * 3 mods.gregtech.mixer.removeByInput(30, [metaitem('dustCoal'), item('minecraft:gunpowder'), item('minecraft:blaze_powder')], null) -mods.gregtech.blender.removeByInput(30, [metaitem('dustCoal'), item('minecraft:gunpowder'), item('minecraft:blaze_powder')], null) mods.gregtech.mixer.recipeBuilder() .inputs(ore('dustCoal')) .inputs(ore('dustGunpowder')) @@ -745,9 +742,6 @@ crafting.addShaped('minecraft:arrow_from_paper', item('minecraft:arrow') * 8, [ mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCarbon') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCharcoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCarbon') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) -mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCharcoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) recipemap('mixer').recipeBuilder() .inputs(ore('dustSaltpeter') * 2) diff --git a/groovy/preInit/MaterialChanges.groovy b/groovy/preInit/MaterialChanges.groovy index c867e640d..6ce18023c 100644 --- a/groovy/preInit/MaterialChanges.groovy +++ b/groovy/preInit/MaterialChanges.groovy @@ -1,3 +1,5 @@ +package preInit; + import net.minecraftforge.fml.common.eventhandler.EventPriority import gregtech.api.unification.material.event.MaterialEvent; diff --git a/groovy/preInit/RegisterElements.groovy b/groovy/preInit/RegisterElements.groovy index 7126df6e1..516590165 100644 --- a/groovy/preInit/RegisterElements.groovy +++ b/groovy/preInit/RegisterElements.groovy @@ -1,3 +1,5 @@ +package preInit; + import gregtech.api.unification.material.Material; import gregtech.api.unification.material.event.MaterialEvent; @@ -11,8 +13,8 @@ import static gregtech.api.unification.material.Materials.*; eventManager.listen { MaterialEvent event -> - println("Running RegisterElements.groovy...") - println("Groovy starting modifying isotopes") + log.infoMC("Running RegisterElements.groovy...") + log.infoMC("Groovy starting modifying isotopes") def mystery = new Material.Builder(32000, "mystery") .dust() @@ -22,6 +24,6 @@ eventManager.listen { mystery.setFormula("?", false); - println("Groovy finished modifying isotopes") + log.infoMC("Groovy finished modifying isotopes") } */ \ No newline at end of file diff --git a/groovy/preInit/RegisterIsotopes.groovy b/groovy/preInit/RegisterIsotopes.groovy index 61ff45658..f623b0f78 100644 --- a/groovy/preInit/RegisterIsotopes.groovy +++ b/groovy/preInit/RegisterIsotopes.groovy @@ -1,4 +1,6 @@ /* +package preInit; + import gregtech.api.unification.material.Material; import gregtech.api.unification.Element; import static gregtech.api.unification.material.info.MaterialIconSet.*; @@ -40,9 +42,9 @@ private void addNuclearFuelMaterials (Material materialName, int startingInt) { eventManager.listen { MaterialEvent event -> - println("Running RegisterIsotopes.groovy...") + log.infoMC("Running RegisterIsotopes.groovy...") - println("Groovy starting modifying elements") + log.infoMC("Groovy starting modifying elements") def Tc_99 = new Element(43, 55, -1, null, "Technetium-99", "Tc-99", true); @@ -543,6 +545,6 @@ eventManager.listen { .color(0xa8a432) .build(); - println("Groovy finished modifying elements") + log.infoMC("Groovy finished modifying elements") } */ \ No newline at end of file diff --git a/groovy/preInit/RegisterMetaItems.groovy b/groovy/preInit/RegisterMetaItems.groovy index 788696980..7d266546d 100644 --- a/groovy/preInit/RegisterMetaItems.groovy +++ b/groovy/preInit/RegisterMetaItems.groovy @@ -1,3 +1,5 @@ +package preInit; + import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.items.metaitem.*; diff --git a/groovy/prePostInit/ModifyRecipeMaps.groovy b/groovy/prePostInit/ModifyRecipeMaps.groovy index 31ab514a7..02a90b8c6 100755 --- a/groovy/prePostInit/ModifyRecipeMaps.groovy +++ b/groovy/prePostInit/ModifyRecipeMaps.groovy @@ -1,7 +1,15 @@ +package prePostInit; + +import gregtech.api.GregTechAPI; +import gregtech.api.recipes.Recipe; import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.GTRecipeHandler; import gregtech.api.recipes.ingredients.GTRecipeInput; +import gregtech.api.unification.material.properties.PropertyKey; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.ore.OrePrefix; import gregtechfoodoption.recipe.GTFORecipeMaps; +import supersymmetry.api.fluids.SusyFluidStorageKeys; import supersymmetry.api.recipes.SuSyRecipeMaps; import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.recipes.GTRecipeHandler.*; @@ -21,22 +29,14 @@ GTRecipeHandler.removeAllRecipes(GTFORecipeMaps.GREENHOUSE_RECIPES); GTRecipeHandler.removeAllRecipes(RecipeMaps.VACUUM_RECIPES); GTRecipeHandler.removeAllRecipes(RecipeMaps.ELECTROLYZER_RECIPES); -//Add mixer recipes to blender - -RecipeMaps.MIXER_RECIPES.onRecipeBuild(recipeBuilder -> { - recipeBuilder.invalidateOnBuildAction(); - SuSyRecipeMaps.BLENDER_RECIPES.recipeBuilder() - .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) - .fluidInputs(recipeBuilder.getFluidInputs()) - .outputs(recipeBuilder.getOutputs()) - .chancedOutputs(recipeBuilder.getChancedOutputs()) - .fluidOutputs(recipeBuilder.getFluidOutputs()) - .cleanroom(recipeBuilder.getCleanroom()) - .duration((int) (recipeBuilder.duration / 4)) - .EUt(recipeBuilder.EUt) - .buildAndRegister(); +GregTechAPI.materialManager.getRegisteredMaterials().forEach(material -> { + if (material.hasProperty(PropertyKey.FLUID) && material.getProperty(PropertyKey.FLUID).getPrimaryKey() == SusyFluidStorageKeys.SLURRY) { + Recipe recipe = RecipeMaps.EXTRACTOR_RECIPES.findRecipe(Integer.MAX_VALUE, Collections.singletonList(OreDictUnifier.get(OrePrefix.dust, material)), Collections.emptyList(), false); + if (recipe != null) { + RecipeMaps.EXTRACTOR_RECIPES.removeRecipe(recipe); + } + } }); - //Removal of certain centrifuging recipes // LPG * 370 diff --git a/groovy/prePostInit/Thermodynamics.groovy b/groovy/prePostInit/Thermodynamics.groovy index 4cccc4ce4..7dd012b5b 100755 --- a/groovy/prePostInit/Thermodynamics.groovy +++ b/groovy/prePostInit/Thermodynamics.groovy @@ -1,3 +1,5 @@ +package prePostInit; + import classes.*; import globals.Globals; diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index af375557a..87c824555 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -1,3 +1,5 @@ +package prePostInit; + import static globals.Globals.* import supersymmetry.common.blocks.SuSyBlocks diff --git a/manifest.json b/manifest.json index 73f1e19fc..f42174d2f 100644 --- a/manifest.json +++ b/manifest.json @@ -11,7 +11,7 @@ "manifestType": "minecraftModpack", "manifestVersion": 1, "name": "Supersymmetry", - "version": "0.1.12.6", + "version": "0.1.12.9", "author": "SymmetricDevs", "externalDeps": [], "files": [ @@ -157,7 +157,7 @@ }, { "projectID": 557242, - "fileID": 5322654, + "fileID": 5506419, "required": true }, { @@ -262,7 +262,7 @@ }, { "projectID": 629629, - "fileID": 5183601, + "fileID": 5487266, "required": true }, { @@ -307,7 +307,7 @@ }, { "projectID": 477021, - "fileID": 5446241, + "fileID": 5500516, "required": true }, { @@ -427,7 +427,7 @@ }, { "projectID": 846224, - "fileID": 5292660, + "fileID": 5508213, "required": true }, { @@ -592,7 +592,7 @@ }, { "projectID": 564858, - "fileID": 5121714, + "fileID": 5508050, "required": true }, { @@ -778,12 +778,12 @@ }, { "projectID": 910715, - "fileID": 4949716, + "fileID": 5229610, "required": true }, { "projectID": 873867, - "fileID": 5163117, + "fileID": 5403908, "required": true }, { @@ -818,7 +818,7 @@ }, { "projectID": 687577, - "fileID": 5219945, + "fileID": 5507936, "required": true }, { diff --git a/resources/gregtech/models/item/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.json b/resources/gregtech/models/item/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.json index d4b389044..87715af31 100644 --- a/resources/gregtech/models/item/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.json +++ b/resources/gregtech/models/item/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/assemblyindiumtinbariumtitaniumcuprate.json b/resources/gregtech/models/item/metaitems/assemblyindiumtinbariumtitaniumcuprate.json index ebe539640..e74e0c6a7 100644 --- a/resources/gregtech/models/item/metaitems/assemblyindiumtinbariumtitaniumcuprate.json +++ b/resources/gregtech/models/item/metaitems/assemblyindiumtinbariumtitaniumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblyindiumtinbariumtitaniumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblyindiumtinbariumtitaniumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/assemblymanganesephosphide.json b/resources/gregtech/models/item/metaitems/assemblymanganesephosphide.json index 98bd545ac..22a4ae435 100644 --- a/resources/gregtech/models/item/metaitems/assemblymanganesephosphide.json +++ b/resources/gregtech/models/item/metaitems/assemblymanganesephosphide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblymanganesephosphide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblymanganesephosphide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/assemblyrutheniumtriniumamericiumneutronate.json b/resources/gregtech/models/item/metaitems/assemblyrutheniumtriniumamericiumneutronate.json index 3622b932c..6b6dbb346 100644 --- a/resources/gregtech/models/item/metaitems/assemblyrutheniumtriniumamericiumneutronate.json +++ b/resources/gregtech/models/item/metaitems/assemblyrutheniumtriniumamericiumneutronate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblyrutheniumtriniumamericiumneutronate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblyrutheniumtriniumamericiumneutronate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/assemblyuraniumrhodiumdinaquadide.json b/resources/gregtech/models/item/metaitems/assemblyuraniumrhodiumdinaquadide.json index fd5a64798..132f5f1f9 100644 --- a/resources/gregtech/models/item/metaitems/assemblyuraniumrhodiumdinaquadide.json +++ b/resources/gregtech/models/item/metaitems/assemblyuraniumrhodiumdinaquadide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblyuraniumrhodiumdinaquadide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblyuraniumrhodiumdinaquadide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/assemblyuraniumtriplatinum.json b/resources/gregtech/models/item/metaitems/assemblyuraniumtriplatinum.json index 679177260..497c4be79 100644 --- a/resources/gregtech/models/item/metaitems/assemblyuraniumtriplatinum.json +++ b/resources/gregtech/models/item/metaitems/assemblyuraniumtriplatinum.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/assemblyuraniumtriplatinum" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/assemblyuraniumtriplatinum" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/baseenrichednaquadahtriniumeuropiumduranide.json b/resources/gregtech/models/item/metaitems/baseenrichednaquadahtriniumeuropiumduranide.json index dbef9d96c..ee465a422 100644 --- a/resources/gregtech/models/item/metaitems/baseenrichednaquadahtriniumeuropiumduranide.json +++ b/resources/gregtech/models/item/metaitems/baseenrichednaquadahtriniumeuropiumduranide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/baseenrichednaquadahtriniumeuropiumduranide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/baseenrichednaquadahtriniumeuropiumduranide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/baseindiumtinbariumtitaniumcuprate.json b/resources/gregtech/models/item/metaitems/baseindiumtinbariumtitaniumcuprate.json index 55aa9c415..d8e008a5f 100644 --- a/resources/gregtech/models/item/metaitems/baseindiumtinbariumtitaniumcuprate.json +++ b/resources/gregtech/models/item/metaitems/baseindiumtinbariumtitaniumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/baseindiumtinbariumtitaniumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/baseindiumtinbariumtitaniumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/basemagnesiumdiboride.json b/resources/gregtech/models/item/metaitems/basemagnesiumdiboride.json index 1bbdca82b..e52a03dbd 100644 --- a/resources/gregtech/models/item/metaitems/basemagnesiumdiboride.json +++ b/resources/gregtech/models/item/metaitems/basemagnesiumdiboride.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/basemagnesiumdiboride" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/basemagnesiumdiboride" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/basemanganesephosphide.json b/resources/gregtech/models/item/metaitems/basemanganesephosphide.json index add073cbb..202dfbce7 100644 --- a/resources/gregtech/models/item/metaitems/basemanganesephosphide.json +++ b/resources/gregtech/models/item/metaitems/basemanganesephosphide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/basemanganesephosphide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/basemanganesephosphide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/basemercurybariumcalciumcuprate.json b/resources/gregtech/models/item/metaitems/basemercurybariumcalciumcuprate.json index 50ed8df85..d4d6f6cde 100644 --- a/resources/gregtech/models/item/metaitems/basemercurybariumcalciumcuprate.json +++ b/resources/gregtech/models/item/metaitems/basemercurybariumcalciumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/basemercurybariumcalciumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/basemercurybariumcalciumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/baserutheniumtriniumamericiumneutronate.json b/resources/gregtech/models/item/metaitems/baserutheniumtriniumamericiumneutronate.json index 0cb7a1500..f6b0dae6e 100644 --- a/resources/gregtech/models/item/metaitems/baserutheniumtriniumamericiumneutronate.json +++ b/resources/gregtech/models/item/metaitems/baserutheniumtriniumamericiumneutronate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/baserutheniumtriniumamericiumneutronate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/baserutheniumtriniumamericiumneutronate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/basesamariumironarsenicoxide.json b/resources/gregtech/models/item/metaitems/basesamariumironarsenicoxide.json index 3a158d3b7..2989ed695 100644 --- a/resources/gregtech/models/item/metaitems/basesamariumironarsenicoxide.json +++ b/resources/gregtech/models/item/metaitems/basesamariumironarsenicoxide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/basesamariumironarsenicoxide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/basesamariumironarsenicoxide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/baseuraniumrhodiumdinaquadide.json b/resources/gregtech/models/item/metaitems/baseuraniumrhodiumdinaquadide.json index 3ce5cc603..ea68a9c93 100644 --- a/resources/gregtech/models/item/metaitems/baseuraniumrhodiumdinaquadide.json +++ b/resources/gregtech/models/item/metaitems/baseuraniumrhodiumdinaquadide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/baseuraniumrhodiumdinaquadide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/baseuraniumrhodiumdinaquadide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/baseuraniumtriplatinum.json b/resources/gregtech/models/item/metaitems/baseuraniumtriplatinum.json index d09add799..1ca76ebe5 100644 --- a/resources/gregtech/models/item/metaitems/baseuraniumtriplatinum.json +++ b/resources/gregtech/models/item/metaitems/baseuraniumtriplatinum.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/baseuraniumtriplatinum" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_2x2", + "textures": { + "all": "gregtech:items/metaitems/baseuraniumtriplatinum" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/cannedmagnesiumdiboride.json b/resources/gregtech/models/item/metaitems/cannedmagnesiumdiboride.json index e2723c88b..6dc2912ad 100644 --- a/resources/gregtech/models/item/metaitems/cannedmagnesiumdiboride.json +++ b/resources/gregtech/models/item/metaitems/cannedmagnesiumdiboride.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/cannedmagnesiumdiboride" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/cannedmagnesiumdiboride" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/cannedmercurybariumcalciumcuprate.json b/resources/gregtech/models/item/metaitems/cannedmercurybariumcalciumcuprate.json index f29080835..5a9511ff8 100644 --- a/resources/gregtech/models/item/metaitems/cannedmercurybariumcalciumcuprate.json +++ b/resources/gregtech/models/item/metaitems/cannedmercurybariumcalciumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/cannedmercurybariumcalciumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/cannedmercurybariumcalciumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/cannedsamariumironarsenicoxide.json b/resources/gregtech/models/item/metaitems/cannedsamariumironarsenicoxide.json index 44f1e92c7..b876db2a6 100644 --- a/resources/gregtech/models/item/metaitems/cannedsamariumironarsenicoxide.json +++ b/resources/gregtech/models/item/metaitems/cannedsamariumironarsenicoxide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/cannedsamariumironarsenicoxide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/cannedsamariumironarsenicoxide" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/pipelike_2x2.json b/resources/gregtech/models/item/metaitems/pipelike_2x2.json new file mode 100644 index 000000000..58201a1b9 --- /dev/null +++ b/resources/gregtech/models/item/metaitems/pipelike_2x2.json @@ -0,0 +1,18 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "elements": [ + { + "from": [7, 7, 0], + "to": [9, 9, 16], + "faces": { + "north": {"uv": [7, 0, 9, 2], "rotation": 90, "texture": "#all"}, + "east": {"uv": [0, 0, 16, 2], "texture": "#all"}, + "south": {"uv": [7, 0, 9, 2], "rotation": 90, "texture": "#all"}, + "west": {"uv": [0, 0, 16, 2], "texture": "#all"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#all"}, + "down": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#all"} + } + } + ] +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/pipelike_4x4.json b/resources/gregtech/models/item/metaitems/pipelike_4x4.json new file mode 100644 index 000000000..26f0cd86f --- /dev/null +++ b/resources/gregtech/models/item/metaitems/pipelike_4x4.json @@ -0,0 +1,18 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "elements": [ + { + "from": [6, 6, 0], + "to": [10, 10, 16], + "faces": { + "north": {"uv": [0, 8, 4, 12], "rotation": 90, "texture": "#all"}, + "east": {"uv": [0, 0, 16, 4], "texture": "#all"}, + "south": {"uv": [0, 8, 4, 12], "rotation": 90, "texture": "#all"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#all"}, + "up": {"uv": [0, 4, 16, 8], "rotation": 90, "texture": "#all"}, + "down": {"uv": [0, 8, 16, 4], "rotation": 270, "texture": "#all"} + } + } + ] +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/sponge.indium.json b/resources/gregtech/models/item/metaitems/sponge.indium.json index 86b09a2be..0b4e7519a 100644 --- a/resources/gregtech/models/item/metaitems/sponge.indium.json +++ b/resources/gregtech/models/item/metaitems/sponge.indium.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/sponge.indium" - } - } \ No newline at end of file + "parent": "block/cube_all", + "textures": { + "all": "gregtech:items/metaitems/sponge.indium" + } +} diff --git a/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json b/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json index ff0d8738e..8bddc971a 100644 --- a/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json +++ b/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubemagnesiumdiboride" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubemagnesiumdiboride" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json b/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json index b0adc08b7..f5baa114c 100644 --- a/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json +++ b/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json b/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json index 993e4fc9d..9199a5e39 100644 --- a/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json +++ b/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubesamariumironarsenicoxide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubesamariumironarsenicoxide" + } +} \ No newline at end of file diff --git a/resources/gregtech/textures/items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.png b/resources/gregtech/textures/items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.png index 7b4750253..a4cc32d52 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.png and b/resources/gregtech/textures/items/metaitems/assemblyenrichednaquadahtriniumeuropiumduranide.png differ diff --git a/resources/gregtech/textures/items/metaitems/assemblyindiumtinbariumtitaniumcuprate.png b/resources/gregtech/textures/items/metaitems/assemblyindiumtinbariumtitaniumcuprate.png index 992582738..4819c691a 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblyindiumtinbariumtitaniumcuprate.png and b/resources/gregtech/textures/items/metaitems/assemblyindiumtinbariumtitaniumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/assemblymanganesephosphide.png b/resources/gregtech/textures/items/metaitems/assemblymanganesephosphide.png index 04a164d73..e2bd1bd45 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblymanganesephosphide.png and b/resources/gregtech/textures/items/metaitems/assemblymanganesephosphide.png differ diff --git a/resources/gregtech/textures/items/metaitems/assemblyrutheniumtriniumamericiumneutronate.png b/resources/gregtech/textures/items/metaitems/assemblyrutheniumtriniumamericiumneutronate.png index 3a407b034..2a9f3e653 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblyrutheniumtriniumamericiumneutronate.png and b/resources/gregtech/textures/items/metaitems/assemblyrutheniumtriniumamericiumneutronate.png differ diff --git a/resources/gregtech/textures/items/metaitems/assemblyuraniumrhodiumdinaquadide.png b/resources/gregtech/textures/items/metaitems/assemblyuraniumrhodiumdinaquadide.png index 0e639fcb3..f096f3789 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblyuraniumrhodiumdinaquadide.png and b/resources/gregtech/textures/items/metaitems/assemblyuraniumrhodiumdinaquadide.png differ diff --git a/resources/gregtech/textures/items/metaitems/assemblyuraniumtriplatinum.png b/resources/gregtech/textures/items/metaitems/assemblyuraniumtriplatinum.png index 4197b136a..658f33117 100644 Binary files a/resources/gregtech/textures/items/metaitems/assemblyuraniumtriplatinum.png and b/resources/gregtech/textures/items/metaitems/assemblyuraniumtriplatinum.png differ diff --git a/resources/gregtech/textures/items/metaitems/baseenrichednaquadahtriniumeuropiumduranide.png b/resources/gregtech/textures/items/metaitems/baseenrichednaquadahtriniumeuropiumduranide.png index c16c1a41f..ce87f4647 100644 Binary files a/resources/gregtech/textures/items/metaitems/baseenrichednaquadahtriniumeuropiumduranide.png and b/resources/gregtech/textures/items/metaitems/baseenrichednaquadahtriniumeuropiumduranide.png differ diff --git a/resources/gregtech/textures/items/metaitems/baseindiumtinbariumtitaniumcuprate.png b/resources/gregtech/textures/items/metaitems/baseindiumtinbariumtitaniumcuprate.png index 366b64768..1e2af7508 100644 Binary files a/resources/gregtech/textures/items/metaitems/baseindiumtinbariumtitaniumcuprate.png and b/resources/gregtech/textures/items/metaitems/baseindiumtinbariumtitaniumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/basemagnesiumdiboride.png b/resources/gregtech/textures/items/metaitems/basemagnesiumdiboride.png index 0848b94e4..3a3f891b0 100644 Binary files a/resources/gregtech/textures/items/metaitems/basemagnesiumdiboride.png and b/resources/gregtech/textures/items/metaitems/basemagnesiumdiboride.png differ diff --git a/resources/gregtech/textures/items/metaitems/basemanganesephosphide.png b/resources/gregtech/textures/items/metaitems/basemanganesephosphide.png index ab0ac07fe..417f8ce19 100644 Binary files a/resources/gregtech/textures/items/metaitems/basemanganesephosphide.png and b/resources/gregtech/textures/items/metaitems/basemanganesephosphide.png differ diff --git a/resources/gregtech/textures/items/metaitems/basemercurybariumcalciumcuprate.png b/resources/gregtech/textures/items/metaitems/basemercurybariumcalciumcuprate.png index 17d34a969..2ec05e090 100644 Binary files a/resources/gregtech/textures/items/metaitems/basemercurybariumcalciumcuprate.png and b/resources/gregtech/textures/items/metaitems/basemercurybariumcalciumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/baserutheniumtriniumamericiumneutronate.png b/resources/gregtech/textures/items/metaitems/baserutheniumtriniumamericiumneutronate.png index 8d62fcc15..3aee6a437 100644 Binary files a/resources/gregtech/textures/items/metaitems/baserutheniumtriniumamericiumneutronate.png and b/resources/gregtech/textures/items/metaitems/baserutheniumtriniumamericiumneutronate.png differ diff --git a/resources/gregtech/textures/items/metaitems/basesamariumironarsenicoxide.png b/resources/gregtech/textures/items/metaitems/basesamariumironarsenicoxide.png index 844617384..008ef480b 100644 Binary files a/resources/gregtech/textures/items/metaitems/basesamariumironarsenicoxide.png and b/resources/gregtech/textures/items/metaitems/basesamariumironarsenicoxide.png differ diff --git a/resources/gregtech/textures/items/metaitems/baseuraniumrhodiumdinaquadide.png b/resources/gregtech/textures/items/metaitems/baseuraniumrhodiumdinaquadide.png index 5f4c26986..80cd0fcca 100644 Binary files a/resources/gregtech/textures/items/metaitems/baseuraniumrhodiumdinaquadide.png and b/resources/gregtech/textures/items/metaitems/baseuraniumrhodiumdinaquadide.png differ diff --git a/resources/gregtech/textures/items/metaitems/baseuraniumtriplatinum.png b/resources/gregtech/textures/items/metaitems/baseuraniumtriplatinum.png index 53c84bd08..e70db8820 100644 Binary files a/resources/gregtech/textures/items/metaitems/baseuraniumtriplatinum.png and b/resources/gregtech/textures/items/metaitems/baseuraniumtriplatinum.png differ diff --git a/resources/gregtech/textures/items/metaitems/cannedmagnesiumdiboride.png b/resources/gregtech/textures/items/metaitems/cannedmagnesiumdiboride.png index 6b2ebc566..d57ca5491 100644 Binary files a/resources/gregtech/textures/items/metaitems/cannedmagnesiumdiboride.png and b/resources/gregtech/textures/items/metaitems/cannedmagnesiumdiboride.png differ diff --git a/resources/gregtech/textures/items/metaitems/cannedmercurybariumcalciumcuprate.png b/resources/gregtech/textures/items/metaitems/cannedmercurybariumcalciumcuprate.png index 6913165fc..668129f61 100644 Binary files a/resources/gregtech/textures/items/metaitems/cannedmercurybariumcalciumcuprate.png and b/resources/gregtech/textures/items/metaitems/cannedmercurybariumcalciumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/cannedsamariumironarsenicoxide.png b/resources/gregtech/textures/items/metaitems/cannedsamariumironarsenicoxide.png index 32e1235b6..d31c14bc2 100644 Binary files a/resources/gregtech/textures/items/metaitems/cannedsamariumironarsenicoxide.png and b/resources/gregtech/textures/items/metaitems/cannedsamariumironarsenicoxide.png differ diff --git a/resources/gregtech/textures/items/metaitems/sponge.cadmium.png b/resources/gregtech/textures/items/metaitems/sponge.cadmium.png index bffdd8d2c..079d623b9 100644 Binary files a/resources/gregtech/textures/items/metaitems/sponge.cadmium.png and b/resources/gregtech/textures/items/metaitems/sponge.cadmium.png differ diff --git a/resources/gregtech/textures/items/metaitems/sponge.hafnium.crude.png b/resources/gregtech/textures/items/metaitems/sponge.hafnium.crude.png index e16a4bf6c..e56c78c5c 100644 Binary files a/resources/gregtech/textures/items/metaitems/sponge.hafnium.crude.png and b/resources/gregtech/textures/items/metaitems/sponge.hafnium.crude.png differ diff --git a/resources/gregtech/textures/items/metaitems/sponge.hafnium.png b/resources/gregtech/textures/items/metaitems/sponge.hafnium.png index 7040827ff..9a90893ef 100644 Binary files a/resources/gregtech/textures/items/metaitems/sponge.hafnium.png and b/resources/gregtech/textures/items/metaitems/sponge.hafnium.png differ diff --git a/resources/gregtech/textures/items/metaitems/sponge.indium.png b/resources/gregtech/textures/items/metaitems/sponge.indium.png index 229c06e8e..d6c3b6918 100644 Binary files a/resources/gregtech/textures/items/metaitems/sponge.indium.png and b/resources/gregtech/textures/items/metaitems/sponge.indium.png differ diff --git a/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png b/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png index faae87047..d9325c5fa 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png and b/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png differ diff --git a/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png b/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png index af87f0799..53b3a71b4 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png and b/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png b/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png index c328c3383..589ffc74e 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png and b/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png differ diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 58cf6408f..0ef625bf9 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -1896,8 +1896,6 @@ susy.material.polyvinyl_alcohol=Polyvinyl Alcohol susy.material.impure_thallium_sulfate_solution=Impure Thallium Sulfate Solution susy.material.thallium_i_chloride=Thallium I Chloride susy.material.thallium_sulfate_solution=Thallium Sulfate Solution -susy.material.arsenic_iii_oxide=Arsenic III Oxide -susy.material.antimony_iii_oxide=Antimony III Oxide susy.material.impure_cadmium_sulfate_solution=Impure Cadmium Sulfate Solution susy.material.purified_cadmium_solution=Purified Cadmium Solution susy.material.spent_pbi_solution=Spent PBI Solution @@ -1964,6 +1962,19 @@ susy.material.caesium_rubidium_alum_mixture=Caesium-Rubidium Alum Mixture susy.material.methyl_formate_solution=Methyl Formate Solution susy.material.acidic_thallium_sulfate_solution=Acidic Thallium Sulfate Solution susy.material.ethyl_acetate=Ethyl Acetate +susy.material.dense_steam=Dense Steam +susy.material.nether_molecular_sieve=Nether Molecular Sieve +susy.material.heavy_nether_gases=Heavy Nether Gases +susy.material.sodium_thioantimonite_solution=Sodium Thioantimonite Solution +susy.material.purified_antimony_trichloride=Purified Antimony Trichloride +susy.material.purified_antimony_trioxide=Purified Antimony Trioxide +susy.material.copper_i_sulfide=Copper I Sulfide +susy.material.copper_ii_sulfide=Copper II Sulfide +susy.material.potassium_permanganate=Potassium Permanganate +susy.material.potassium_manganate=Potassium Manganate +susy.material.lead_free_solder=Lead-Free Solder +susy.material.cryogenic_solder=Cryogenic Solder +susy.material.oxidized_manganate_solution=Oxidized Manganate Solution # Isotopes