diff --git a/custom/textures/shields/shields_inv_shield_admin.png b/custom/textures/shields/shields_inv_shield_admin.png new file mode 100755 index 0000000..eb9a0cd Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_admin.png differ diff --git a/custom/textures/shields/shields_inv_shield_black_mithril_warrior.png b/custom/textures/shields/shields_inv_shield_black_mithril_warrior.png new file mode 100644 index 0000000..c4e9c9a Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_black_mithril_warrior.png differ diff --git a/custom/textures/shields/shields_inv_shield_bronze.png b/custom/textures/shields/shields_inv_shield_bronze.png new file mode 100755 index 0000000..ae70293 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_bronze.png differ diff --git a/custom/textures/shields/shields_inv_shield_cactus.png b/custom/textures/shields/shields_inv_shield_cactus.png new file mode 100755 index 0000000..e06ff5b Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_cactus.png differ diff --git a/custom/textures/shields/shields_inv_shield_crystal.png b/custom/textures/shields/shields_inv_shield_crystal.png new file mode 100644 index 0000000..fdc5f32 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_crystal.png differ diff --git a/custom/textures/shields/shields_inv_shield_diamond.png b/custom/textures/shields/shields_inv_shield_diamond.png new file mode 100755 index 0000000..0d54498 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_diamond.png differ diff --git a/custom/textures/shields/shields_inv_shield_enhanced_cactus.png b/custom/textures/shields/shields_inv_shield_enhanced_cactus.png new file mode 100755 index 0000000..6bbe19f Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_enhanced_cactus.png differ diff --git a/custom/textures/shields/shields_inv_shield_enhanced_wood.png b/custom/textures/shields/shields_inv_shield_enhanced_wood.png new file mode 100755 index 0000000..bd2bebc Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_enhanced_wood.png differ diff --git a/custom/textures/shields/shields_inv_shield_gold.png b/custom/textures/shields/shields_inv_shield_gold.png new file mode 100755 index 0000000..30f4d79 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_gold.png differ diff --git a/custom/textures/shields/shields_inv_shield_mithril.png b/custom/textures/shields/shields_inv_shield_mithril.png new file mode 100644 index 0000000..2e0a767 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_mithril.png differ diff --git a/custom/textures/shields/shields_inv_shield_steel.png b/custom/textures/shields/shields_inv_shield_steel.png new file mode 100755 index 0000000..b39120e Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_steel.png differ diff --git a/custom/textures/shields/shields_inv_shield_wood.png b/custom/textures/shields/shields_inv_shield_wood.png new file mode 100755 index 0000000..da40020 Binary files /dev/null and b/custom/textures/shields/shields_inv_shield_wood.png differ diff --git a/custom/textures/shields/shields_shield_admin.png b/custom/textures/shields/shields_shield_admin.png new file mode 100644 index 0000000..8b466d3 Binary files /dev/null and b/custom/textures/shields/shields_shield_admin.png differ diff --git a/custom/textures/shields/shields_shield_admin_preview.png b/custom/textures/shields/shields_shield_admin_preview.png new file mode 100644 index 0000000..86d2f9b Binary files /dev/null and b/custom/textures/shields/shields_shield_admin_preview.png differ diff --git a/custom/textures/shields/shields_shield_blackmithril.png b/custom/textures/shields/shields_shield_blackmithril.png new file mode 100755 index 0000000..f19048a Binary files /dev/null and b/custom/textures/shields/shields_shield_blackmithril.png differ diff --git a/custom/textures/shields/shields_shield_blackmithril_preview.png b/custom/textures/shields/shields_shield_blackmithril_preview.png new file mode 100644 index 0000000..64f58e6 Binary files /dev/null and b/custom/textures/shields/shields_shield_blackmithril_preview.png differ diff --git a/custom/textures/shields/shields_shield_bronze.png b/custom/textures/shields/shields_shield_bronze.png new file mode 100644 index 0000000..1f25ada Binary files /dev/null and b/custom/textures/shields/shields_shield_bronze.png differ diff --git a/custom/textures/shields/shields_shield_bronze_preview.png b/custom/textures/shields/shields_shield_bronze_preview.png new file mode 100644 index 0000000..18acce9 Binary files /dev/null and b/custom/textures/shields/shields_shield_bronze_preview.png differ diff --git a/custom/textures/shields/shields_shield_cactus.png b/custom/textures/shields/shields_shield_cactus.png new file mode 100644 index 0000000..19cca87 Binary files /dev/null and b/custom/textures/shields/shields_shield_cactus.png differ diff --git a/custom/textures/shields/shields_shield_cactus_preview.png b/custom/textures/shields/shields_shield_cactus_preview.png new file mode 100644 index 0000000..67cc4de Binary files /dev/null and b/custom/textures/shields/shields_shield_cactus_preview.png differ diff --git a/custom/textures/shields/shields_shield_crystal.png b/custom/textures/shields/shields_shield_crystal.png new file mode 100644 index 0000000..c991a28 Binary files /dev/null and b/custom/textures/shields/shields_shield_crystal.png differ diff --git a/custom/textures/shields/shields_shield_crystal_preview.png b/custom/textures/shields/shields_shield_crystal_preview.png new file mode 100644 index 0000000..2fd8d8d Binary files /dev/null and b/custom/textures/shields/shields_shield_crystal_preview.png differ diff --git a/custom/textures/shields/shields_shield_diamond.png b/custom/textures/shields/shields_shield_diamond.png new file mode 100644 index 0000000..dc6a7d2 Binary files /dev/null and b/custom/textures/shields/shields_shield_diamond.png differ diff --git a/custom/textures/shields/shields_shield_diamond_preview.png b/custom/textures/shields/shields_shield_diamond_preview.png new file mode 100644 index 0000000..6ea838a Binary files /dev/null and b/custom/textures/shields/shields_shield_diamond_preview.png differ diff --git a/custom/textures/shields/shields_shield_enhanced_cactus.png b/custom/textures/shields/shields_shield_enhanced_cactus.png new file mode 100644 index 0000000..fe81651 Binary files /dev/null and b/custom/textures/shields/shields_shield_enhanced_cactus.png differ diff --git a/custom/textures/shields/shields_shield_enhanced_cactus_preview.png b/custom/textures/shields/shields_shield_enhanced_cactus_preview.png new file mode 100644 index 0000000..0da7f56 Binary files /dev/null and b/custom/textures/shields/shields_shield_enhanced_cactus_preview.png differ diff --git a/custom/textures/shields/shields_shield_enhanced_wood.png b/custom/textures/shields/shields_shield_enhanced_wood.png new file mode 100644 index 0000000..a86c4fd Binary files /dev/null and b/custom/textures/shields/shields_shield_enhanced_wood.png differ diff --git a/custom/textures/shields/shields_shield_enhanced_wood_preview.png b/custom/textures/shields/shields_shield_enhanced_wood_preview.png new file mode 100644 index 0000000..adfe1a6 Binary files /dev/null and b/custom/textures/shields/shields_shield_enhanced_wood_preview.png differ diff --git a/custom/textures/shields/shields_shield_gold.png b/custom/textures/shields/shields_shield_gold.png new file mode 100644 index 0000000..abfc7a1 Binary files /dev/null and b/custom/textures/shields/shields_shield_gold.png differ diff --git a/custom/textures/shields/shields_shield_gold_preview.png b/custom/textures/shields/shields_shield_gold_preview.png new file mode 100644 index 0000000..94317c6 Binary files /dev/null and b/custom/textures/shields/shields_shield_gold_preview.png differ diff --git a/custom/textures/shields/shields_shield_mithril.png b/custom/textures/shields/shields_shield_mithril.png new file mode 100644 index 0000000..d64a144 Binary files /dev/null and b/custom/textures/shields/shields_shield_mithril.png differ diff --git a/custom/textures/shields/shields_shield_mithril_preview.png b/custom/textures/shields/shields_shield_mithril_preview.png new file mode 100644 index 0000000..209dc80 Binary files /dev/null and b/custom/textures/shields/shields_shield_mithril_preview.png differ diff --git a/custom/textures/shields/shields_shield_steel.png b/custom/textures/shields/shields_shield_steel.png new file mode 100644 index 0000000..df54f9c Binary files /dev/null and b/custom/textures/shields/shields_shield_steel.png differ diff --git a/custom/textures/shields/shields_shield_steel_preview.png b/custom/textures/shields/shields_shield_steel_preview.png new file mode 100644 index 0000000..b922bf8 Binary files /dev/null and b/custom/textures/shields/shields_shield_steel_preview.png differ diff --git a/custom/textures/shields/shields_shield_wood.png b/custom/textures/shields/shields_shield_wood.png new file mode 100644 index 0000000..4646e3d Binary files /dev/null and b/custom/textures/shields/shields_shield_wood.png differ diff --git a/custom/textures/shields/shields_shield_wood_preview.png b/custom/textures/shields/shields_shield_wood_preview.png new file mode 100644 index 0000000..2197248 Binary files /dev/null and b/custom/textures/shields/shields_shield_wood_preview.png differ diff --git a/install.sh b/install.sh index 7294bd6..7470c5d 100755 --- a/install.sh +++ b/install.sh @@ -82,25 +82,25 @@ install_0.4() { cd server-0.4 git pull verif - git submodule update --remote --recursive + git -c http.sslVerify=false submodule update --remote --recursive verif cd .. elif [[ $continuer == "clean" ]]; then rm -rf server-0.4 - git clone https://github.com/sys4-fr/server-nalc.git server-0.4 + git -c http.sslVerify=false clone -b dev $URL/server-nalc.git server-0.4 verif cd server-0.4 - git submodule update --init --recursive + git -c http.sslVerify=false submodule update --init --recursive verif cd .. else echo "Mise à jour annulé." fi else - git clone https://github.com/sys4-fr/server-nalc.git server-0.4 + git -c http.sslVerify=false clone -b dev $URL/server-nalc.git server-0.4 verif cd server-0.4 - git submodule update --init --recursive + git -c http.sslVerify=false submodule update --init --recursive verif cd .. fi @@ -138,9 +138,9 @@ install_minetest() { if [[ ! -d minetest ]]; then local branch="-b master" if [[ $ver == "0.4" ]]; then - branch="-b backport-0.4" + branch="-b stable-0.4" fi - git clone $branch $URL/minetest.git + git -c http.sslVerify=false clone $branch $URL/minetest.git verif fi @@ -182,9 +182,9 @@ install_minetest_game() { if [[ ! -d minetest_game ]]; then local branch="-b master" if [[ $ver == "0.4" ]]; then - branch="-b backport-0.4" + branch="-b stable-0.4" fi - git clone $branch $URL/minetest_game.git + git -c http.sslVerify=false clone $branch $URL/minetest_game.git verif echo "Clonage de minetest_game terminé." fi @@ -234,7 +234,7 @@ install_mods() { if [[ $ver == "0.4" ]]; then local i=0 local md[1]="" # Mods to disable - for mod in 3d_armor_ip 3d_armor_inv mysql_auth watershed mobs_old magicmithril blackmithril hardenedleather reinforcedleather obsidian eventobjects player_inactive random_messages irc irc_commands profilerdumper profnsched; do + for mod in 3d_armor_ip 3d_armor_sfinv mysql_auth watershed mobs_old magicmithril blackmithril hardenedleather reinforcedleather obsidian eventobjects player_inactive random_messages irc irc_commands profilerdumper profnsched; do i=$(( $i+1 )) md[$i]=$mod done @@ -362,6 +362,12 @@ post_install() { cp server-0.4/other_things/scripts/Server-side/script/start-mff.sh ./start.sh echo "Veuiller éditer le fichier start.sh" fi + + # fix technic_worldgen crash + cd server-0.4/mods/technic + git checkout fb93388f06fe87ee75aaaf04cf6edcf01a26d981 technic_worldgen/oregen.lua + cd ../../.. + echo "Fix technic_worldgen pour éviter crash appliqué." fi # skindb updater (à relancer à la main plusieurs fois pour l'instant) @@ -380,7 +386,8 @@ init() { elif [[ -n $url ]]; then URL=$url else - URL="https://github.com/sys4-fr" + #URL="https://github.com/sys4-fr" + URL="https://sys4.fr/gogs/NotreAmiLeCube" fi read -p "L'installation va démarrer. Continuer ? (y or n) : " continue