sync with upstream, improve conf examples

patches/Bucket_Game-basis/mods/codermobs/codermobs/LICENSE

@@ -3,6 +3,10 @@ es.
 
 ----------------------------------------------------------------------
 
+License: CC0 aka CC Public Domain
+is, or was, described by:
+https://creativecommons.org/publicdomain/zero/1.0/
+
 License: CC BY-SA 4.0
 is, or was, described by:
 https://creativecommons.org/licenses/by-sa/4.0/
@@ -11,7 +15,7 @@ License: CC BY-SA 3.0
 is, or was, described by:
 https://creativecommons.org/licenses/by-sa/3.0/
 
-Liense: CC BY-NC-SA 4.0
+License: CC BY-NC-SA 4.0
 is, or was, described by:
 https://creativecommons.org/licenses/by-nc-sa/4.0/
 
@@ -28,18 +32,22 @@ licenses are copyright and licensed as follows:
 
 ----------------------------------------------------------------------
 
-Media for "baby_chick":
+Models and mesh textures for "baby_chick", "bom", and "icebom":
-(c) 2019 and CC-BY-NC-SA 3.0: Poikilos.
+
+(c) 2019 and CC-BY-NC-SA 4.0: Poikilos. OldCoder as well for the "ice-
+bom" mesh texture.
+
+For sound-file information, see the Lua files.
 
 ----------------------------------------------------------------------
 
 Improved Spider/Bug Sounds:
 codermobs_damage_giant_exoskeleton, codermobs_death_giant_bug,
-codermobs_use_giant_exoskeleton   
+codermobs_use_giant_exoskeleton
 (c) 2019 and CC BY-SA 4.0: Poikilos
 
 Improved Particles:
-codermobs_blood, codermobs_damage_stone, codermobs_lott_spider_blood  
+codermobs_blood, codermobs_damage_stone, codermobs_lott_spider_blood
 (c) 2019 and CC BY-SA 4.0: Poikilos
 
 codermobs_fireball:
@@ -47,12 +55,10 @@ codermobs_fireball:
 
 ----------------------------------------------------------------------
 
-Media for "animal_materials",  "deer", "elk", "ostrich", and "sacreep-
+Media for "animal_materials", "deer", "elk", and "ostrich":
-er":
 
 See  the  5 associated  Lua  source files.  In general,  the media is:
-(c) 2012 to 2019 and  CC-BY-SA 3.0:  Sapier and Poikilos,  except  for
+(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier and Poikilos.
-"sacreeper" for which the media is just Sapier.
 
 The "ostrich" texture is as described above but also attribution: Old-
 Coder.

patches/Bucket_Game-basis/mods/codermobs/codermobs/init.lua

@@ -26,11 +26,12 @@ dofile (mp .. "/bee.lua"          )
 dofile (mp .. "/beetle.lua"       )
 
 dofile (mp .. "/bird.lua"         )
+dofile (mp .. "/bom.lua"          )
 dofile (mp .. "/bug.lua"          )
 dofile (mp .. "/bunny.lua"        )
 dofile (mp .. "/butterfly.lua"    )
-dofile (mp .. "/cacodemon.lua"    )
 
+dofile (mp .. "/cacodemon.lua"    )
 dofile (mp .. "/car.lua"          )
 dofile (mp .. "/chicken.lua"      )
 dofile (mp .. "/cow.lua"          )
@@ -48,26 +49,26 @@ dofile (mp .. "/ghost.lua"        )
 dofile (mp .. "/goat.lua"         )
 dofile (mp .. "/hedgehog.lua"     )
 
+dofile (mp .. "/icebom.lua"       )
 dofile (mp .. "/jeraf.lua"        )
 dofile (mp .. "/kitten.lua"       )
 dofile (mp .. "/lava_flan.lua"    )
 dofile (mp .. "/lostsoul.lua"     )
-dofile (mp .. "/lott_spider.lua"  )
 
+dofile (mp .. "/lott_spider.lua"  )
 dofile (mp .. "/mammoth.lua"      )
 dofile (mp .. "/mdskeleton.lua"   )
 dofile (mp .. "/oerkki.lua"       )
 dofile (mp .. "/ostrich.lua"      )
-dofile (mp .. "/owl.lua"          )
 
+dofile (mp .. "/owl.lua"          )
 dofile (mp .. "/panda.lua"        )
 dofile (mp .. "/penguin.lua"      )
 dofile (mp .. "/plane.lua"        )
 dofile (mp .. "/polar_bear.lua"   )
-dofile (mp .. "/rat.lua"          )
 
+dofile (mp .. "/rat.lua"          )
 dofile (mp .. "/rat_better.lua"   )
-dofile (mp .. "/sacreeper.lua"    )
 dofile (mp .. "/santa.lua"        )
 dofile (mp .. "/sheep.lua"        )
 dofile (mp .. "/silverfish.lua"   )
@@ -82,9 +83,10 @@ dofile (mp .. "/warthog.lua"      )
 dofile (mp .. "/wolf.lua"         )
 dofile (mp .. "/zebra.lua"        )
 
-dofile (mp .. "/baby_chick.lua"   )
+-- Baby Chick should be defined after chicken.
+-- Moon Cow   should be defined after regular cow.
 
--- Moon Cow must be defined after regular cow.
+dofile (mp .. "/baby_chick.lua"   )
 
 if enable_moontest then
     dofile (mp .. "/mooncow.lua")

patches/deprecated/merged-upstream/LapisLazuli/lapis_config.diff

@@ -0,0 +1,12 @@
+--- LapisLazuli-init.lua	2019-05-18 17:47:01.306322922 -0400
++++ init.lua	2019-05-18 17:47:36.863117105 -0400
+@@ -1,6 +1,8 @@
+ screwdriver = screwdriver or {}
+ 
+---dofile(minetest.get_modpath("lapis").."/columns.lua")
++if minetest.settings:get_bool("enable_lapis_mod_columns") then
++    dofile(minetest.get_modpath("lapis").."/columns.lua")
++end
+ 
+ ----------
+ --Nodes

patches/prepatch.sh

@@ -103,7 +103,14 @@ if [ -f "$file2_path" ]; then
 fi
 echo "* creating $file2_path"
 cp -f "$file0_path" "$file2_path" || customDie "Cannot cp '$file0_path' '$file2_path'"
-
+if [ -f "`command -v geany`" ]; then
+    nohup geany "$file2_path" &
+fi
+if [ -d "$HOME/minetest/games/ENLIVEN" ]; then
+    if [ -f "`command -v meld`" ]; then
+        nohup meld "$file2_path" "$HOME/minetest/games/ENLIVEN/$what" &
+    fi
+fi
 
 eval "arr=($licenses)"
 for license in "${arr[@]}"; do

patches/subgame/minetest.LAN-client-example.conf

@@ -1,4 +1,4 @@
-enable_round_lapis_columns = true
+enable_lapis_mod_columns = true
 enable_footsteps = true
 lifetimer = 20000
 maintab_LAST = online

patches/subgame/minetest.client-example.conf

@@ -1,5 +1,5 @@
 # address =
-enable_round_lapis_columns = true
+enable_lapis_mod_columns = true
 lifetimer = 20000
 ambient_occlusion_gamma = 2.2
 anisotropic_filter = true
@@ -8,16 +8,14 @@ cinematic_camera_smoothing = 0.7
 cloud_height = 120
 cloud_radius = 12
 connected_glass = true
-creative_mode = false
 directional_colored_fog = true
 enable_3d_clouds = true
 enable_bumpmapping = true
 enable_clouds = true
-enable_damage = true
+# enable_local_map_saving: optional (saves visited parts of server)
-#optional:
 enable_local_map_saving = true
 enable_minimap = true
-#optional:
+# enable_remote_media_server: optional (may improve performance if servers implement this and you allow it)
 enable_remote_media_server = true
 enable_shaders = true
 enable_waving_leaves = true
@@ -26,38 +24,36 @@ enable_waving_water = true
 fallback_font_shadow = 1
 fallback_font_shadow_alpha = 255
 fallback_font_size = 16
-fast_move = true
+# fixed_map_seed =
-#fixed_map_seed =
 font_shadow = 1
 font_shadow_alpha = 255
 font_size = 16
-free_move = true
+# generate_normalmaps: not very good--creates ugly outline around each pixel
-#generate_normalmaps = true
+# generate_normalmaps = true
 hudbars_bar_type = statbar_modern
 inventory_items_animations = true
-mainmenu_last_selected_world = 2
+# mainmenu_last_selected_world = 2
-#optional (maintab_LAST note: local tab was formerly called singleplayer)
+# maintab_LAST: optional (note: "local" tab was formerly called singleplayer; caption later changed to "Start Game")
 maintab_LAST = local
 menu_clouds = true
 # name =
-optional:
+# menu_last_game: optionally set to ENLIVEN
 menu_last_game = ENLIVEN
 mg_name = v7
 minimap_shape_round = true
 mono_font_size = 22
-noclip = true
 pause_fps_max = 20
-#optional:
+# public_serverlist: disable to only allow LAN and singleplayer until checked again
 public_serverlist = true
 remote_port = 30000
-#selected_world_path =
+# selected_world_path =
 server_announce = false
 server_dedicated = false
 # serverlist_file = favoriteservers.txt
 # serverlist_url =
 smooth_lighting = true
 texture_clean_transparent = true
-#texture_min_size = 64
+# texture_min_size = 64
 tone_mapping = true
 video_driver = opengl
 vsync = true
@@ -66,3 +62,19 @@ water_wave_length = 20.0
 water_wave_speed = 5.0
 wieldview_node_tiles = false
 wieldview_update_time = 2
+
+# region warnings
+# DO THIS IN world.mt instead: creative_mode = false
+# DO THIS IN world.mt instead: enable_damage = true
+# DO THIS IN world.conf instead: enable_builder = true
+# DO THIS IN world.conf instead: enable_bucket_city = false
+# endregion warnings
+
+# region trivial defaults
+# noclip:  requires noclip priv (The setting just determines state at start of game)
+# free_move  requires fly priv (The setting just determines state at start of game)
+# fast_move: requires fast priv (The setting just determines state at start of game)
+noclip = true
+free_move = true
+fast_move = true
+# endregion trivial defaults

patches/subgame/minetest.server-example.conf

@@ -5,7 +5,7 @@
 # The CenterOfTheSun server overrides the settings below.
 # See "EnlivenMinetest/overrides/worlds/CenterOfTheSun/world.conf"
 # instead.
-enable_round_lapis_columns = true
+enable_lapis_mod_columns = true
 enable_footsteps = true
 lifetimer = 20000