From 6a5fc146a18ea43779163c231ab80c3b4709697a Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 30 Sep 2018 11:26:04 +0200 Subject: [PATCH] Mod Update Issues: - castles is now a modpack, make sure to enable all necessary submodules (like masonry and storage) - fun_caves gave a lot of errors on startup, disabled most of it --- Minetest-WorldEdit | 2 +- airtanks | 2 +- bakedclay | 2 +- castle | 2 +- cottages | 2 +- currency | 2 +- darkage | 2 +- display_modpack | 2 +- farming | 2 +- food | 2 +- fun_caves | 2 +- handle_schematics | 2 +- homedecor | 2 +- mapfix | 2 +- mesecons | 2 +- mg | 2 +- mg_villages | 2 +- mobf_trader | 2 +- mobs_animal | 2 +- mobs_redo | 2 +- moreblocks | 2 +- moreores | 2 +- moretrees | 2 +- mydoors | 2 +- patches/disable-funcaves-cave-generation | 17 ++++ patches/fix-funcaves | 107 +++++++++++++++++++++++ patches/series | 3 +- pipeworks | 2 +- plantlife_modpack | 2 +- technic | 2 +- travelnet | 2 +- unified_inventory | 2 +- unifiedbricks | 2 +- unifieddyes | 2 +- wielded_light | 2 +- 35 files changed, 158 insertions(+), 33 deletions(-) create mode 100644 patches/disable-funcaves-cave-generation create mode 100644 patches/fix-funcaves diff --git a/Minetest-WorldEdit b/Minetest-WorldEdit index 7b1deb1..f725663 160000 --- a/Minetest-WorldEdit +++ b/Minetest-WorldEdit @@ -1 +1 @@ -Subproject commit 7b1deb1b61bc28b3e105833788eb07dfb1326984 +Subproject commit f7256633c03f2bc60288271dbd17ef4ed31256ae diff --git a/airtanks b/airtanks index 5787956..868c3a7 160000 --- a/airtanks +++ b/airtanks @@ -1 +1 @@ -Subproject commit 57879561034c08acf2294c2500bf03d9e635afaa +Subproject commit 868c3a78aee78c2badfd16a273e7d231c7bd6032 diff --git a/bakedclay b/bakedclay index 2689469..67d0f2a 160000 --- a/bakedclay +++ b/bakedclay @@ -1 +1 @@ -Subproject commit 268946971aab3c4299672a22e43781cd189b94bc +Subproject commit 67d0f2a8d6bdf88a788421110479057e025bfb85 diff --git a/castle b/castle index 3780586..87e9fa2 160000 --- a/castle +++ b/castle @@ -1 +1 @@ -Subproject commit 3780586d11f62c717e8a6330cd8762cbb915015b +Subproject commit 87e9fa250614377d69d40ae0adaea2a7348a7763 diff --git a/cottages b/cottages index d607c8a..739f3a7 160000 --- a/cottages +++ b/cottages @@ -1 +1 @@ -Subproject commit d607c8af311e0beaa3d3331f6acbf722985c9b62 +Subproject commit 739f3a7ac4d221590383d5d8cd97f821c7d61b87 diff --git a/currency b/currency index 2f17ee7..5a97f46 160000 --- a/currency +++ b/currency @@ -1 +1 @@ -Subproject commit 2f17ee7099113f2a9629ac54316cdf755311f7e5 +Subproject commit 5a97f4610db8b38ad0fff9ffba1969f55ac830a5 diff --git a/darkage b/darkage index 686d531..19f2fa7 160000 --- a/darkage +++ b/darkage @@ -1 +1 @@ -Subproject commit 686d5316afa650602c85cc4c197a3cb866a82b9c +Subproject commit 19f2fa743590c4b7bea2329015dd68e7071d40ee diff --git a/display_modpack b/display_modpack index aa319e4..5586b9d 160000 --- a/display_modpack +++ b/display_modpack @@ -1 +1 @@ -Subproject commit aa319e41446570b187bc3f3d96a8a1d85aea5874 +Subproject commit 5586b9d1c4598903a08f9b633fdc9543a15f23ce diff --git a/farming b/farming index c4e88fc..d7bc9b1 160000 --- a/farming +++ b/farming @@ -1 +1 @@ -Subproject commit c4e88fc332d107e050b8a3111b21e7f9fc04fad6 +Subproject commit d7bc9b16fc68af6fbd643c6afdf619a0478a8579 diff --git a/food b/food index 57d0b42..9b97006 160000 --- a/food +++ b/food @@ -1 +1 @@ -Subproject commit 57d0b42892b7d957b83d61b4969b19ec49459951 +Subproject commit 9b9700692349c09528acb167ba0d9e0dec6cad5e diff --git a/fun_caves b/fun_caves index 70c310f..fc58528 160000 --- a/fun_caves +++ b/fun_caves @@ -1 +1 @@ -Subproject commit 70c310f0ec76eed5d640d4e43872d86652829679 +Subproject commit fc585287c02b6c671676538e65e712a4496f8849 diff --git a/handle_schematics b/handle_schematics index 6357bcf..fcb4c18 160000 --- a/handle_schematics +++ b/handle_schematics @@ -1 +1 @@ -Subproject commit 6357bcf7740246bd87e7e29677a203c5221d3e14 +Subproject commit fcb4c181613ca51600ef0bc21e012cced5ac31c5 diff --git a/homedecor b/homedecor index bfda7c4..9e69a6d 160000 --- a/homedecor +++ b/homedecor @@ -1 +1 @@ -Subproject commit bfda7c49fdde4ef9f48fc73976ef2193541173d0 +Subproject commit 9e69a6db739622d4eccb103dfd8403898301041e diff --git a/mapfix b/mapfix index ca4b20d..4d3f650 160000 --- a/mapfix +++ b/mapfix @@ -1 +1 @@ -Subproject commit ca4b20ddcc5bf55115c16760af76db023c1d86f3 +Subproject commit 4d3f6505b54b7047823a69d539aa6706b51d2dfa diff --git a/mesecons b/mesecons index f70a308..028c290 160000 --- a/mesecons +++ b/mesecons @@ -1 +1 @@ -Subproject commit f70a308bb0bddefe963a6b82016f67d3be122069 +Subproject commit 028c290cd70591383682c244a95a955fd3cba083 diff --git a/mg b/mg index 36925bf..0367403 160000 --- a/mg +++ b/mg @@ -1 +1 @@ -Subproject commit 36925bfbae90aa5a8b56fc40cce06e229da4dc84 +Subproject commit 03674033c6c45d1241ee181e52a512e9011d5774 diff --git a/mg_villages b/mg_villages index 2cb2bb8..395ca25 160000 --- a/mg_villages +++ b/mg_villages @@ -1 +1 @@ -Subproject commit 2cb2bb860af79e2079b1f3aca40430a8207edc4a +Subproject commit 395ca252ae570cb7c80ab0bdf98479291dd86a32 diff --git a/mobf_trader b/mobf_trader index 02588b7..cb55c33 160000 --- a/mobf_trader +++ b/mobf_trader @@ -1 +1 @@ -Subproject commit 02588b7e624ce60c20fbd9a576841c9b5ded5f62 +Subproject commit cb55c339a53a532e71670bced7a2ba645c0266b0 diff --git a/mobs_animal b/mobs_animal index 0db8d4b..b6f81c4 160000 --- a/mobs_animal +++ b/mobs_animal @@ -1 +1 @@ -Subproject commit 0db8d4b2639ece8f913079cb6e5499354fb1a0a9 +Subproject commit b6f81c4abaaea39ae0f7e73b7feca11a848f05a1 diff --git a/mobs_redo b/mobs_redo index ec4ba73..6bf6e8f 160000 --- a/mobs_redo +++ b/mobs_redo @@ -1 +1 @@ -Subproject commit ec4ba73bab1140c9a639df05f83921f7e47e1b94 +Subproject commit 6bf6e8fbd86764f5bb3a45a7ce0f17681d9c76da diff --git a/moreblocks b/moreblocks index f2ede87..5fc5fce 160000 --- a/moreblocks +++ b/moreblocks @@ -1 +1 @@ -Subproject commit f2ede87a5af2fccc9ce4ff1dc2fa20efccdeb846 +Subproject commit 5fc5fce74e18856ce898c46b75ecb07fca914784 diff --git a/moreores b/moreores index 238e92a..2316595 160000 --- a/moreores +++ b/moreores @@ -1 +1 @@ -Subproject commit 238e92a6bf39c8a48841442206eba7828eab94f6 +Subproject commit 2316595ab9331c20abe5c7cd4dffef22f4671227 diff --git a/moretrees b/moretrees index 324155f..61d1c54 160000 --- a/moretrees +++ b/moretrees @@ -1 +1 @@ -Subproject commit 324155f80519259fdf58f43604cecbf47bfb035e +Subproject commit 61d1c54faf1187afe2e3b9c142afd559ec159fd0 diff --git a/mydoors b/mydoors index 63aef13..eef3b5f 160000 --- a/mydoors +++ b/mydoors @@ -1 +1 @@ -Subproject commit 63aef13ae29a44abeeefdf72ed893d3b3fb1d2f4 +Subproject commit eef3b5f9ae92d4423a71a0e73ad637c0fd56fbd5 diff --git a/patches/disable-funcaves-cave-generation b/patches/disable-funcaves-cave-generation new file mode 100644 index 0000000..9e76814 --- /dev/null +++ b/patches/disable-funcaves-cave-generation @@ -0,0 +1,17 @@ +--- a/fun_caves/init.lua ++++ b/fun_caves/init.lua +@@ -246,10 +246,10 @@ fun_caves.time_y_loop = 0 + duanes_collision_avoidance = false + + +-minetest.register_on_mapgen_init(function(mgparams) +- --minetest.set_mapgen_setting('mg_flags', "nocaves, nodungeons", true) +- minetest.set_mapgen_setting('mg_flags', "nocaves", true) +-end) ++-- minetest.register_on_mapgen_init(function(mgparams) ++-- --minetest.set_mapgen_setting('mg_flags', "nocaves, nodungeons", true) ++-- minetest.set_mapgen_setting('mg_flags', "nocaves", true) ++-- end) + + + --dofile(fun_caves.path .. "/abms.lua") diff --git a/patches/fix-funcaves b/patches/fix-funcaves new file mode 100644 index 0000000..723c1bc --- /dev/null +++ b/patches/fix-funcaves @@ -0,0 +1,107 @@ +--- a/fun_caves/init.lua ++++ b/fun_caves/init.lua +@@ -288,7 +288,7 @@ else + + fun_caves.construct_nodes = {} + function fun_caves.add_construct(node_name) +- fun_caves.construct_nodes[node[node_name]] = true ++ fun_caves.construct_nodes[fun_caves.node[node_name]] = true + end + + dofile(fun_caves.path .. "/mapgen.lua") +@@ -313,49 +313,49 @@ end + --end) + + +-do +- local ignore_ore = {} +- ignore_ore['default:clay'] = true +- ignore_ore['default:gravel'] = true +- ignore_ore['default:sand'] = true +- ignore_ore['default:silver_sand'] = true +- ignore_ore['default:dirt'] = true +- +- local new_reg = {} +- for n, d in pairs(minetest.registered_ores) do +- for non = 1, 1 do +- if ignore_ore[d.ore] then +- break +- end +- +- if type(d.wherein) == 'table' then +- local stone +- for _, n in pairs(d.wherein) do +- if n == 'default:stone' then +- stone = true +- break +- end +- end +- if not stone then +- break +- end +- elseif d.wherein ~= 'default:stone' then +- break +- end +- +- local def = table.copy(d) +- def.wherein = {'fun_caves:basalt', 'fun_caves:granite', 'fun_caves:stone_with_moss', 'fun_caves:stone_with_algae', 'fun_caves:stone_with_lichen', 'fun_caves:stone_with_salt'} +- new_reg[#new_reg+1] = def +- local hot_def = table.copy(d) +- hot_def.wherein = 'fun_caves:hot_cobble' +- hot_def.clust_scarcity = math.floor(hot_def.clust_scarcity / 2) +- new_reg[#new_reg+1] = hot_def +- end +- end +- +- for _, def in ipairs(new_reg) do +- minetest.register_ore(def) +- --print('Fun Caves: registering '..def.ore..' in special stones') +- --print(dump(def)) +- end +-end ++-- do ++-- local ignore_ore = {} ++-- ignore_ore['default:clay'] = true ++-- ignore_ore['default:gravel'] = true ++-- ignore_ore['default:sand'] = true ++-- ignore_ore['default:silver_sand'] = true ++-- ignore_ore['default:dirt'] = true ++-- ++-- local new_reg = {} ++-- for n, d in pairs(minetest.registered_ores) do ++-- for non = 1, 1 do ++-- if ignore_ore[d.ore] then ++-- break ++-- end ++-- ++-- if type(d.wherein) == 'table' then ++-- local stone ++-- for _, n in pairs(d.wherein) do ++-- if n == 'default:stone' then ++-- stone = true ++-- break ++-- end ++-- end ++-- if not stone then ++-- break ++-- end ++-- elseif d.wherein ~= 'default:stone' then ++-- break ++-- end ++-- ++-- local def = table.copy(d) ++-- def.wherein = {'fun_caves:basalt', 'fun_caves:granite', 'fun_caves:stone_with_moss', 'fun_caves:stone_with_algae', 'fun_caves:stone_with_lichen', 'fun_caves:stone_with_salt'} ++-- new_reg[#new_reg+1] = def ++-- local hot_def = table.copy(d) ++-- hot_def.wherein = 'fun_caves:hot_cobble' ++-- hot_def.clust_scarcity = 0 ++-- new_reg[#new_reg+1] = hot_def ++-- end ++-- end ++-- ++-- for _, def in ipairs(new_reg) do ++-- minetest.register_ore(def) ++-- --print('Fun Caves: registering '..def.ore..' in special stones') ++-- --print(dump(def)) ++-- end ++-- end diff --git a/patches/series b/patches/series index b4ec7ee..fe1124d 100644 --- a/patches/series +++ b/patches/series @@ -1,3 +1,4 @@ mg-villages-customization.diff create-mymonths-settings-file.diff -disable-funcaves-cave-generation.diff +fix-funcaves +disable-funcaves-cave-generation diff --git a/pipeworks b/pipeworks index a2f9be2..cb8a4f3 160000 --- a/pipeworks +++ b/pipeworks @@ -1 +1 @@ -Subproject commit a2f9be258e15572608dac70dc2160d7324741868 +Subproject commit cb8a4f3cecd7b8b9ade4b82314eb725116e424e2 diff --git a/plantlife_modpack b/plantlife_modpack index 156f068..9789d6d 160000 --- a/plantlife_modpack +++ b/plantlife_modpack @@ -1 +1 @@ -Subproject commit 156f068ead94d4545b29869966085d43dd051f74 +Subproject commit 9789d6da3a5c8365236d4f0e4fdaaff0ee1c6757 diff --git a/technic b/technic index 37d4914..92dd0f4 160000 --- a/technic +++ b/technic @@ -1 +1 @@ -Subproject commit 37d49142cfebc821bc6fd994fb7e7ae8dba9d66d +Subproject commit 92dd0f4af891043f8554f730964f63db8b5e3dc8 diff --git a/travelnet b/travelnet index a2dc7a3..33c88ec 160000 --- a/travelnet +++ b/travelnet @@ -1 +1 @@ -Subproject commit a2dc7a39c913b60fa14015a19a45ef08edb9fef0 +Subproject commit 33c88ecb98b6c68802139ed04ba8f1f9b8290198 diff --git a/unified_inventory b/unified_inventory index 2ab5a7c..77c3de0 160000 --- a/unified_inventory +++ b/unified_inventory @@ -1 +1 @@ -Subproject commit 2ab5a7c90a59db14c60bdb07d306eac89987e9f5 +Subproject commit 77c3de08ced2149706e8c3656e1b14f06cf4d7d0 diff --git a/unifiedbricks b/unifiedbricks index d77d445..c227ceb 160000 --- a/unifiedbricks +++ b/unifiedbricks @@ -1 +1 @@ -Subproject commit d77d445edfd574ab85299d4421accbc16aa7cda6 +Subproject commit c227ceb798746f6165e38a0d53bd620f56b760f4 diff --git a/unifieddyes b/unifieddyes index df177c2..40c899c 160000 --- a/unifieddyes +++ b/unifieddyes @@ -1 +1 @@ -Subproject commit df177c26a75ec1880704b24dafe402cfe91cfe33 +Subproject commit 40c899c2b5a947eb64704a7430b7ca7c704a666a diff --git a/wielded_light b/wielded_light index 9b1cb76..62c92f5 160000 --- a/wielded_light +++ b/wielded_light @@ -1 +1 @@ -Subproject commit 9b1cb76a77427147c8dde7ca42a2f1d81b24c6c4 +Subproject commit 62c92f573c487fcff53107f0853609000b1b06c0