Merge pull request #116 from dacmot/mods_update_with_new_script

Mods update with new script
minetest-whynot · Aug 7, 2022 · 74284b9 · 74284b9
2 parents 0ace101 + e1dc163
commit 74284b9
Show file tree

Hide file tree

Showing 118 changed files with 1,569 additions and 4,989 deletions.
diff --git a/builder/lib-build-whynot.sh b/builder/lib-build-whynot.sh
@@ -46,6 +46,11 @@ function process_update_mods {
   cd $subm
   echo -n "Processing $subm... "
 
+  echo '' >> "$LOG"
+  echo `git remote -v | grep '\(fetch\)'` >> "$LOG"
+  git branch --format '%(HEAD) %(objectname) %(subject)' | grep '^[*]' >> "$LOG"
+  echo "Mod: $subm" >> "$LOG"
+
   local branch="origin/HEAD"
   if [ ${BRANCHES[$subm]+_} ]; then
     branch=${BRANCHES[$subm]}
@@ -99,11 +104,6 @@ function process_update_mods {
 
   fi
 
-  echo '' >> "$LOG"
-  echo `git remote -v | grep '\(fetch\)'` >> "$LOG"
-  git branch --format '%(HEAD) %(objectname) %(subject)' | grep '^[*]' >> "$LOG"
-  echo "Mod: $subm" >> "$LOG"
-
 }
 export -f process_update_mods
 

diff --git a/builder/lib-config-whynot.sh b/builder/lib-config-whynot.sh
@@ -6,6 +6,8 @@
   declare -Ag BRANCHES=(
     [minetest_game/minetest_game]=origin/stable-5 # Stay on stable version
     [flora_ores/farming]=0b06c7cd450c5ec9a76b3c22a9c57f06e4f8a7c2 # freeze due to incompatibility with milk buckets
+    [decor/basic_materials]=8b681d9755a16efeca8d0b9f81f5a267cf93fa44 # freeze due to usage of sound_api
+    [decor/homedecor_modpack]=3ba59dc2d5d14c74bc2664eebcbff764f96f6f26 # freeze due to usage of sound_api
   )
 
   #

diff --git a/builder/mods_src/decor/basic_materials b/builder/mods_src/decor/basic_materials
diff --git a/builder/mods_src/decor/home_workshop_modpack b/builder/mods_src/decor/home_workshop_modpack
diff --git a/builder/mods_src/decor/homedecor_modpack b/builder/mods_src/decor/homedecor_modpack
diff --git a/builder/mods_src/decor/mydoors b/builder/mods_src/decor/mydoors
diff --git a/builder/mods_src/libs/whynot_compat/init.lua b/builder/mods_src/libs/whynot_compat/init.lua
@@ -110,7 +110,7 @@ for _ , material in ipairs({ "Adobe", "fakegrass", "grate", "hardwood",
 			table.copy(nodedef.tiles),
 			nodedef.description.." stair",
 			nodedef.description.." slab",
-			table.copy(nodedef.sounds),
+			table.copy(nodedef.sounds or nodedef._sound_def),
 			false,
 			nodedef.description.." inner stair",
 			nodedef.description.." outer stair" )

diff --git a/builder/mods_src/mobs_redo/mobs_monster b/builder/mods_src/mobs_redo/mobs_monster
diff --git a/builder/mods_src/mobs_redo/mobs_redo b/builder/mods_src/mobs_redo/mobs_redo
diff --git a/builder/mods_src/player/skinsdb b/builder/mods_src/player/skinsdb
diff --git a/builder/mods_src/player/wielded_light b/builder/mods_src/player/wielded_light
diff --git a/builder/mods_src/tools/bonemeal b/builder/mods_src/tools/bonemeal
diff --git a/builder/mods_src/tools/boost_cart b/builder/mods_src/tools/boost_cart
diff --git a/builder/mods_src/tools/hopper b/builder/mods_src/tools/hopper
diff --git a/builder/mods_src/tools/jumping b/builder/mods_src/tools/jumping
+0 −3		.gitmodules
+27 −4		.luacheckrc
+0 −30		README.md
+0 −34		aliases.lua
+0 −137		craftitems.lua
+0 −403		crafts.lua
+86 −0		electrical-electronic.lua
+6 −5		init.lua
+300 −0		metals.lua
+126 −0		misc.lua
+2 −1		mod.conf
+0 −54		nodes.lua
+56 −0		plastics.lua
+0 −1		sound_api_core
+1 −1		.luacheckrc
+2 −2		home_vending_machines/crafts.lua
+2 −1		home_vending_machines/mod.conf
+22 −0		home_workshop_machines/init.lua
+1 −2		home_workshop_machines/mod.conf
+1 −0		modpack.conf
+0 −1		description.txt
+2 −0		modpack.conf
+0 −0		modpack.txt
+0 −3		my_castle_doors/depends.txt
+0 −1		my_castle_doors/description.txt
+2 −0		my_castle_doors/mod.conf
+0 −3		my_cottage_doors/depends.txt
+0 −1		my_cottage_doors/description.txt
+2 −0		my_cottage_doors/mod.conf
+0 −3		my_default_doors/depends.txt
+0 −1		my_default_doors/description.txt
+2 −0		my_default_doors/mod.conf
+3 −0		my_door_wood/mod.conf
+0 −3		my_fancy_doors/depends.txt
+0 −1		my_fancy_doors/description.txt
+2 −0		my_fancy_doors/mod.conf
+0 −1		my_future_doors/depends.txt
+0 −1		my_future_doors/description.txt
+2 −0		my_future_doors/mod.conf
+1 −0		my_garage_door/mod.conf
+0 −3		my_hidden_doors/depends.txt
+0 −1		my_hidden_doors/description.txt
+2 −0		my_hidden_doors/mod.conf
+0 −4		my_misc_doors/depends.txt
+0 −1		my_misc_doors/description.txt
+2 −0		my_misc_doors/mod.conf
+0 −3		my_old_doors/depends.txt
+0 −1		my_old_doors/description.txt
+2 −0		my_old_doors/mod.conf
+0 −3		my_saloon_doors/depends.txt
+0 −1		my_saloon_doors/description.txt
+2 −0		my_saloon_doors/mod.conf
+0 −1		my_sliding_doors/description.txt
+1 −0		my_sliding_doors/mod.conf
+11 −0		.github/workflows/build.yml
+13 −0		.luacheckrc
+2 −2		formspecs.lua
+2 −2		skin_meta_api.lua
+1 −1		skinlist.lua
+1 −1		skins_updater.lua
+3 −0		.gitignore
+18 −27		cart_entity.lua
+13 −6		functions.lua
+1 −7		init.lua
+2 −0		config.lua
+10 −0		init.lua
+13 −0		license.txt
+6 −3		nodes/chute.lua
+14 −8		nodes/hoppers.lua
+10 −8		nodes/sorter.lua
+13 −10		settingtypes.txt
+ −		textures/hopper_mode_eject.png
+ −		textures/hopper_mode_hold.png
+ −		textures/hopper_mode_off.png
+ −		textures/hopper_mode_on.png
+8 −6		utility.lua