diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/369071060.json b/config/betterquesting/DefaultQuests/Quests/1052610336/369071060.json index 97cdbb0..e5d605d 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/369071060.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/369071060.json @@ -11,7 +11,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description\n\n§3很遗憾地告诉你，如果你想直接开始使用电力高炉烧制硅晶棒并切割出硅晶圆来使用高级配方，那么你会发现这个配方需要的电压是MV级，所以还是先使用砷化镓的配方吧。", + "desc:8": "一种在高级电路中常见的元件。\n\n可选的细线材料有§a铜§r，§a退火铜§r与§a钽§r，晶体材料有§b小堆砷化镓粉§r与§b硅晶圆§r，流体材料有§d玻璃§r与§d聚乙烯§r，不同的材料组合会决定最终输出的数量。\n\n§3很遗憾地告诉你，如果你想直接开始使用电力高炉烧制硅晶棒并切割出硅晶圆来使用高级配方，那么你会发现这个配方需要的电压是MV级，所以还是先使用砷化镓的配方吧。", "frame:8": "PRICKLE", "icon:10": { "Count:3": 1, @@ -22,6 +22,19 @@ } }, "questID:3": 369071060, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 16, + "Damage:2": 521, + "id:8": "gregtech:meta_item_1" + } + } + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json b/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json index f5cff33..c1b51eb 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json @@ -18,6 +18,24 @@ } }, "questID:3": 58271814, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 16, + "Damage:2": 100, + "id:8": "gregtech:wire_single" + }, + "1:10": { + "Count:3": 64, + "Damage:2": 100, + "id:8": "gregtech:meta_foil" + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/1052610336/62846306.json b/config/betterquesting/DefaultQuests/Quests/1052610336/62846306.json index 5a5cee9..df5271e 100644 --- a/config/betterquesting/DefaultQuests/Quests/1052610336/62846306.json +++ b/config/betterquesting/DefaultQuests/Quests/1052610336/62846306.json @@ -4,7 +4,7 @@ ], "properties:10": { "betterquesting:10": { - "desc:8": "No Description", + "desc:8": "如果你的§6电力高炉§r的设置没问题，那你应该可以成功烧制一些§b铝锭§r，这是下个阶段的必备材料。\n\n另外，§9冰晶石§r与§a三氧化二铝§r也是可选的处理线路，你可以查看对应的处理线路来决定使用其中的哪一种。\n\n§3你可以选择加入保护气，也可以直接烧制，这是可选的。如果缺少铝粉，请查看本页中的“电解粘土”任务。", "frame:8": "GEAR", "icon:10": { "Count:3": 1, @@ -15,6 +15,36 @@ } }, "questID:3": 62846306, + "rewards:9": { + "0:10": { + "choices:9": { + "0:10": { + "Count:3": 64, + "Damage:2": 78, + "id:8": "gregtech:meta_item_1", + "tag:10": { + "Fluid:10": { + "Amount:3": 1000, + "FluidName:8": "nitrogen" + } + } + }, + "1:10": { + "Count:3": 64, + "Damage:2": 78, + "id:8": "gregtech:meta_item_1", + "tag:10": { + "Fluid:10": { + "Amount:3": 1000, + "FluidName:8": "hydrogen" + } + } + } + }, + "index:3": 0, + "rewardID:8": "bq_standard:choice" + } + }, "tasks:9": { "0:10": { "index:3": 0, diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/1369640251.json b/config/betterquesting/DefaultQuests/Quests/343719817/1369640251.json index ae24885..4d57473 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/1369640251.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/1369640251.json @@ -18,5 +18,17 @@ } }, "questID:3": 1369640251, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10009, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/1945563942.json b/config/betterquesting/DefaultQuests/Quests/343719817/1945563942.json index a4c086a..726f075 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/1945563942.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/1945563942.json @@ -22,12 +22,6 @@ "questID:3": 1945563942, "tasks:9": { "0:10": { - "index:3": 0, - "optional:1": 1, - "requiredItems:9": {}, - "taskID:8": "bq_standard:retrieval" - }, - "1:10": { "index:3": 1, "requiredItems:9": { "0:10": { diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/657719354.json b/config/betterquesting/DefaultQuests/Quests/343719817/657719354.json index 7b92490..3552c04 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/657719354.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/657719354.json @@ -18,5 +18,17 @@ } }, "questID:3": 657719354, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10011, + "id:8": "gtlitecore:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/343719817/660488523.json b/config/betterquesting/DefaultQuests/Quests/343719817/660488523.json index 426a322..9e9b081 100644 --- a/config/betterquesting/DefaultQuests/Quests/343719817/660488523.json +++ b/config/betterquesting/DefaultQuests/Quests/343719817/660488523.json @@ -15,5 +15,17 @@ } }, "questID:3": 660488523, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 10005, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json b/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json index f36c97d..3d73010 100644 --- a/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json +++ b/config/betterquesting/DefaultQuests/Quests/717308044/234936908.json @@ -15,5 +15,32 @@ } }, "questID:3": 234936908, - "tasks:9": {} + "tasks:9": { + "0:10": { + "index:3": 0, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 11525, + "id:8": "gregtech:mte" + }, + "1:10": { + "Count:3": 1, + "Damage:2": 11526, + "id:8": "gregtech:mte" + }, + "2:10": { + "Count:3": 1, + "Damage:2": 11532, + "id:8": "gregtech:mte" + }, + "3:10": { + "Count:3": 1, + "Damage:2": 11533, + "id:8": "gregtech:mte" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } \ No newline at end of file diff --git a/index.toml b/index.toml index 620abe4..3eb5c8e 100644 --- a/index.toml +++ b/index.toml @@ -322,7 +322,7 @@ hash = "f19d268233f92e06e1d8f1ce612205706564e22f99be4f55039e30064847ec8f" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/369071060.json" -hash = "def1581bcbe20f6c4d83e4a2bc2f1b76d6d84dd0838fdd461f39d92d4ded9836" +hash = "90dd0242d8383968136c2f14464f2e7814a0b8e94c403736a41a820d95668563" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/37465416.json" @@ -386,7 +386,7 @@ hash = "99047f789f9fbd52bba0387068c1385d765ea8eab28cd3df0155391fd58f0181" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/58271814.json" -hash = "f8a4c9ca1c5a2925a7020116d63f56f01f2a97744edb6fc31c8b26c1024d91be" +hash = "7d06e585f8d68bffcad4247137939449c7ffb68f47876356ffeb5bbdd055f33a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/589853967.json" @@ -398,7 +398,7 @@ hash = "398b5d172b20b97361b5f5c47963fb031f305838b61009bffb1ca048011f7a56" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/62846306.json" -hash = "e1dff10362a047a9fe6563f3f8dc3407ce4f0f46d356e4fb3bac076d924146e9" +hash = "cf7f5ce1b15adf229107566290b23facc778a2f2de14ce5c0fe0bc33ce569e36" [[files]] file = "config/betterquesting/DefaultQuests/Quests/1052610336/641879794.json" @@ -1518,7 +1518,7 @@ hash = "37c26fb81e7e77a2291bd658bfdfc7c3fbef897154567c90f1729716b527299e" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/1369640251.json" -hash = "972fc4da871b48dfb1d827c9e287f81e15b37c8e1b6f272f46aca26f1c9a3f13" +hash = "b573592a297b8982c1506756acbb8cc88903b212852ae5acbf5602d3a3b402e9" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/1398228445.json" @@ -1590,7 +1590,7 @@ hash = "37a3e78f615326f2ea8c27a89d1ef311ecba34cfab6b4f56231db5d9e3d12f95" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/1945563942.json" -hash = "c0152c75c5cf859313d290b65c46f653f762788abfbc0d1befa43a012639691b" +hash = "ff5c1b784e9bbdfb2c46ed7c38419ddb676c6b3aadee715e368c48245adb282b" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/1987065571.json" @@ -1658,11 +1658,11 @@ hash = "d896d1c7b4f2540e29f3d91a1e13747691dac9f10d1a0692057cb5d0dea823f8" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/657719354.json" -hash = "3c419ede1a3717d391648ef02d085535d155df270c9f0029a05f5dc1012783a5" +hash = "ede25c145fc87a0542babfd9ecadda8a2f7f9f98b0b4662c1ed1938343a15197" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/660488523.json" -hash = "7dc81eeb5a97e6a2b2b46ae927b840351b34ed4cc21c9ba02a690b5d7a38d912" +hash = "bd987bd9502db9639f74222589888b8f1215e434d2af37bd238be4009a09dfb5" [[files]] file = "config/betterquesting/DefaultQuests/Quests/343719817/713533116.json" @@ -2214,7 +2214,7 @@ hash = "3f2ea6437055c9752fadc1d63d646ffc344d346760dcff59cbeccca4f789fcde" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/234936908.json" -hash = "86860b5a80d92d70791f67c69cb91e965a567ca1e93e77c0ddf1ac71f0b4d929" +hash = "3e0f983cb0f09a201c33cf23fded1cb7ef2e4f9922258c00db87a85108e29a6a" [[files]] file = "config/betterquesting/DefaultQuests/Quests/717308044/239716163.json" @@ -3115,7 +3115,7 @@ metafile = true [[files]] file = "mods/gtlitecore-1.0.0.jar" -hash = "aa05025f4df7e54cddf947c90ed4752baf3fe2572d52d7781641f48eee7ee802" +hash = "26797595817d4b9ff3e18ae680cd6587a3e04cf97e7e59b5e7c911ff9c8bd69b" [[files]] file = "mods/had-enough-characters.pw.toml" @@ -3129,7 +3129,7 @@ metafile = true [[files]] file = "mods/ingameime-vintage.pw.toml" -hash = "9f2afa4e69aeaf27024d1b81b42ef00492bf7b98b4e9ab3a902ade2f90ab0ff7" +hash = "b31e001afac34b35a5f15d7c40f0ec81cc4c3def0361bdd95072bb467cdcc89b" metafile = true [[files]] @@ -3417,10 +3417,26 @@ hash = "41fd5d50b33cfd0b98324b4f3a36cbc6456ead6ce54e8c16fe5718be5b93525e" file = "resources/betterquesting/lang/zh_cn.lang" hash = "0213eea9646f613a2380319c4e8402f073848248fcb0257006bc1e820ee5f7ea" +[[files]] +file = "resources/betterquesting/textures/gui/default_title.png" +hash = "875db4b09eea6c5e84151e0b0cc0684191effdb200f3111b8504a1ec582037b1" + +[[files]] +file = "resources/betterquesting/textures/gui/editor_icons.png" +hash = "96a56dd72a33f33fa58a19ec368f284aa61116a158a89cee4bff473c2ab8ff09" + +[[files]] +file = "resources/betterquesting/textures/gui/ex_frames.png" +hash = "b4587d92c5208b4fb0bd21d2ce988936adb31bb820b4be8aa2493e2b26b1c0cf" + [[files]] file = "resources/betterquesting/textures/items/quest_book.png" hash = "0f9fc3b29b57387f3646121aa28ebeb4bcb63e6863b848ee59aa9abb80bc19d3" +[[files]] +file = "resources/bq_standard/textures/gui/gui_themes.png" +hash = "742bfab82bfd3f25351cd388f50db5d93b9715a017c37874eefad1d044de7277" + [[files]] file = "resources/catalogue/lang/zh_cn.lang" hash = "53c30dd4a26b29f6f81c6bfa5038ad5cc6a4193362ec5e56fff0cd2800ce3b0d" diff --git a/mods/gtlitecore-1.0.0.jar b/mods/gtlitecore-1.0.0.jar index c5a4b2d..d1fb101 100644 Binary files a/mods/gtlitecore-1.0.0.jar and b/mods/gtlitecore-1.0.0.jar differ diff --git a/mods/ingameime-vintage.pw.toml b/mods/ingameime-vintage.pw.toml index ae847d0..7aba829 100644 --- a/mods/ingameime-vintage.pw.toml +++ b/mods/ingameime-vintage.pw.toml @@ -1,13 +1,13 @@ name = "IngameIME Vintage" -filename = "ingameime-1.0.0-RC2.jar" -side = "client" +filename = "ingameime-1.0.1.jar" +side = "both" [download] hash-format = "sha1" -hash = "b00f2828e95fddf0732a1aa439e23e02f20094c9" +hash = "5f9c2287021e1f066999dd622705fe94acea4823" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 7792782 +file-id = 8246056 project-id = 1281907 diff --git a/pack.toml b/pack.toml index 50fac25..5cca5c9 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "42c4d7eee75f1524f87a6eab19a92164fdfacbaf01dd5132d76cb938962969e9" +hash = "cdd537ea9ccbc758c217b266f7ee159000e2aa8c6c322773ac5c7acd68c9a5a1" [versions] forge = "14.23.5.2860" diff --git a/resources/betterquesting/textures/gui/default_title.png b/resources/betterquesting/textures/gui/default_title.png new file mode 100644 index 0000000..090b0b0 Binary files /dev/null and b/resources/betterquesting/textures/gui/default_title.png differ diff --git a/resources/betterquesting/textures/gui/editor_icons.png b/resources/betterquesting/textures/gui/editor_icons.png new file mode 100644 index 0000000..ff9bcbe Binary files /dev/null and b/resources/betterquesting/textures/gui/editor_icons.png differ diff --git a/resources/betterquesting/textures/gui/ex_frames.png b/resources/betterquesting/textures/gui/ex_frames.png new file mode 100644 index 0000000..e2e4953 Binary files /dev/null and b/resources/betterquesting/textures/gui/ex_frames.png differ diff --git a/resources/bq_standard/textures/gui/gui_themes.png b/resources/bq_standard/textures/gui/gui_themes.png new file mode 100644 index 0000000..b953e08 Binary files /dev/null and b/resources/bq_standard/textures/gui/gui_themes.png differ