diff --git a/bin/backup.sh b/bin/backup.sh index 385b23687..7de4bb581 100755 --- a/bin/backup.sh +++ b/bin/backup.sh @@ -69,4 +69,4 @@ function main { exit 0 } -main +main "$@" diff --git a/bin/unmined.sh b/bin/unmined.sh index 72acef973..a752daa5c 100755 --- a/bin/unmined.sh +++ b/bin/unmined.sh @@ -8,15 +8,31 @@ # Download unmined: https://unmined.net/downloads/ +# The backup log is saved to /tmp +exec 3>&1 4>&2 +trap 'exec 2>&4 1>&3' 0 1 2 3 +exec 1>/var/log/minecraft/unmined.log 2>&1 + #/home/minecraft/mapping/unmined-cli/unmined-cli image render --trim --world="/home/minecraft/alpha/crazyworld" \ # --output="/home/minecraft/mapping/crazyworld.png" #/home/minecraft/mapping/unmined-cli/unmined-cli image render --trim --world="/home/minecraft/minecraft/world" \ # --output="/home/minecraft/mapping/world.png" # make sure nginx is running +#declare FOLDERS=( +# "server_minecraft/world" +# "server_minecraft/world_nether" +# "server_alpha/alpha" +#) +#NUM_SERVERS=${#FOLDERS[@]} + +for ((i = 0; i < $NUM_SERVERS; i++)); do + echo "Mapping world: ${FOLDERS[$i]}" | figlet | lolcat + unmined-cli web render --world="/home/minecraft/server_minecraft/world" --output="/var/www/html/map" +done echo "Mapping world" | figlet | lolcat unmined-cli web render --world="/home/minecraft/server_minecraft/world" --output="/var/www/html/map" #echo "Mapping nether" | figlet | lolcat -#unmined-cli web render --world="/home/minecraft/server_minecraft/world_nether" --output="/var/www/html/map_nether" +#unmined-cli web render --world="/home/minecraft/server_minecraft/world_nether" --output="/var/www/html/map_nether" \ No newline at end of file diff --git a/mods/OptiFine_1.20_HD_U_I5_pre5.jar b/mods/OptiFine_1.20_HD_U_I5_pre5.jar deleted file mode 100644 index d10034d2b..000000000 Binary files a/mods/OptiFine_1.20_HD_U_I5_pre5.jar and /dev/null differ diff --git a/server_alpha/alpha/DIM-1/data/capabilities.dat b/server_alpha/alpha/DIM-1/data/capabilities.dat index 780b2006b..03a06d2f2 100644 Binary files a/server_alpha/alpha/DIM-1/data/capabilities.dat and b/server_alpha/alpha/DIM-1/data/capabilities.dat differ diff --git a/server_alpha/alpha/DIM-1/data/raids.dat b/server_alpha/alpha/DIM-1/data/raids.dat index 15cc8f11b..491802df5 100644 Binary files a/server_alpha/alpha/DIM-1/data/raids.dat and b/server_alpha/alpha/DIM-1/data/raids.dat differ diff --git a/server_alpha/alpha/DIM1/data/capabilities.dat b/server_alpha/alpha/DIM1/data/capabilities.dat index 780b2006b..03a06d2f2 100644 Binary files a/server_alpha/alpha/DIM1/data/capabilities.dat and b/server_alpha/alpha/DIM1/data/capabilities.dat differ diff --git a/server_alpha/alpha/DIM1/data/raids_end.dat b/server_alpha/alpha/DIM1/data/raids_end.dat index 15cc8f11b..491802df5 100644 Binary files a/server_alpha/alpha/DIM1/data/raids_end.dat and b/server_alpha/alpha/DIM1/data/raids_end.dat differ diff --git a/server_alpha/alpha/advancements/f7a3413b-14d0-4c06-9196-e800c7ccf047.json b/server_alpha/alpha/advancements/f7a3413b-14d0-4c06-9196-e800c7ccf047.json index eda44d3ab..ddcf00b1c 100644 --- a/server_alpha/alpha/advancements/f7a3413b-14d0-4c06-9196-e800c7ccf047.json +++ b/server_alpha/alpha/advancements/f7a3413b-14d0-4c06-9196-e800c7ccf047.json @@ -1,18 +1,20 @@ { "minecraft:adventure/adventuring_time": { "criteria": { - "minecraft:beach": "2023-01-29 18:29:00 -0700", - "minecraft:desert": "2023-01-29 18:29:48 -0700", - "minecraft:forest": "2021-08-22 19:10:11 -0700", "minecraft:taiga": "2023-01-29 18:31:33 -0700", - "minecraft:ocean": "2023-01-29 18:29:16 -0700", - "minecraft:jungle": "2023-01-29 18:28:57 -0700", "minecraft:deep_ocean": "2023-01-29 18:29:27 -0700", - "minecraft:river": "2021-08-22 19:10:30 -0700", - "minecraft:swamp": "2021-08-22 19:10:34 -0700", "minecraft:birch_forest": "2023-01-29 18:29:21 -0700", "minecraft:windswept_hills": "2023-01-29 18:30:14 -0700", - "minecraft:plains": "2021-08-22 19:09:05 -0700" + "minecraft:beach": "2023-01-29 18:29:00 -0700", + "minecraft:river": "2021-08-22 20:10:30 -0600", + "minecraft:dripstone_caves": "2025-05-12 14:59:59 -0600", + "minecraft:swamp": "2021-08-22 20:10:34 -0600", + "minecraft:forest": "2021-08-22 20:10:11 -0600", + "minecraft:desert": "2023-01-29 18:29:48 -0700", + "minecraft:ocean": "2023-01-29 18:29:16 -0700", + "minecraft:jungle": "2023-01-29 18:28:57 -0700", + "minecraft:savanna": "2025-05-12 15:03:46 -0600", + "minecraft:plains": "2021-08-22 20:09:05 -0600" }, "done": false }, @@ -108,129 +110,141 @@ }, "minecraft:recipes/decorations/torch": { "criteria": { - "has_stone_pickaxe": "2025-03-14 17:17:52 -0700" + "has_stone_pickaxe": "2025-03-14 18:17:52 -0600" }, "done": true }, "minecraft:story/upgrade_tools": { "criteria": { - "stone_pickaxe": "2025-03-14 17:17:52 -0700" + "stone_pickaxe": "2025-03-14 18:17:52 -0600" }, "done": true }, "minecraft:recipes/tools/wooden_hoe": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/decorations/campfire": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/tools/wooden_pickaxe": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/tools/wooden_axe": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/combat/wooden_sword": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/decorations/ladder": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/tools/wooden_shovel": { "criteria": { - "has_stick": "2025-03-14 17:17:54 -0700" + "has_stick": "2025-03-14 18:17:54 -0600" }, "done": true }, "minecraft:recipes/food/mushroom_stew": { "criteria": { - "has_mushroom_stew": "2025-03-14 17:18:05 -0700" + "has_mushroom_stew": "2025-03-14 18:18:05 -0600" }, "done": true }, "minecraft:recipes/misc/bowl": { "criteria": { - "has_mushroom_stew": "2025-03-14 17:18:05 -0700" + "has_mushroom_stew": "2025-03-14 18:18:05 -0600" }, "done": true }, "minecraft:recipes/transportation/mangrove_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/acacia_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/cherry_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" - }, - "done": true - }, - "minecraft:recipes/transportation/pale_oak_boat": { - "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/bamboo_raft": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/spruce_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/birch_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/oak_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/jungle_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" }, "done": true }, "minecraft:recipes/transportation/dark_oak_boat": { "criteria": { - "in_water": "2025-04-10 09:52:04 -0700" + "in_water": "2025-04-10 10:52:04 -0600" + }, + "done": true + }, + "occultism:occultism/root": { + "criteria": { + "occultism_present": "2025-05-12 13:31:29 -0600" + }, + "done": true + }, + "minecraft:recipes/building_blocks/coal_block": { + "criteria": { + "has_coal": "2025-05-12 15:06:01 -0600" + }, + "done": true + }, + "minecraft:adventure/sleep_in_bed": { + "criteria": { + "slept_in_bed": "2025-05-12 15:06:20 -0600" }, "done": true }, - "DataVersion": 4325 + "DataVersion": 3465 } \ No newline at end of file diff --git a/server_alpha/alpha/data/capabilities.dat b/server_alpha/alpha/data/capabilities.dat index 780b2006b..03a06d2f2 100644 Binary files a/server_alpha/alpha/data/capabilities.dat and b/server_alpha/alpha/data/capabilities.dat differ diff --git a/server_alpha/alpha/data/modonomicon_book_states.dat b/server_alpha/alpha/data/modonomicon_book_states.dat index 532168e10..df875471b 100644 Binary files a/server_alpha/alpha/data/modonomicon_book_states.dat and b/server_alpha/alpha/data/modonomicon_book_states.dat differ diff --git a/server_alpha/alpha/data/raids.dat b/server_alpha/alpha/data/raids.dat index a249751ab..491802df5 100644 Binary files a/server_alpha/alpha/data/raids.dat and b/server_alpha/alpha/data/raids.dat differ diff --git a/server_alpha/alpha/data/random_sequences.dat b/server_alpha/alpha/data/random_sequences.dat index 531212cb6..6902d24dd 100644 Binary files a/server_alpha/alpha/data/random_sequences.dat and b/server_alpha/alpha/data/random_sequences.dat differ diff --git a/server_alpha/alpha/data/waystones.dat b/server_alpha/alpha/data/waystones.dat index f9469790d..f449a15a7 100644 Binary files a/server_alpha/alpha/data/waystones.dat and b/server_alpha/alpha/data/waystones.dat differ diff --git a/server_alpha/alpha/entities/r.-1.-1.mca b/server_alpha/alpha/entities/r.-1.-1.mca index 29a4679b4..93d42df52 100644 Binary files a/server_alpha/alpha/entities/r.-1.-1.mca and b/server_alpha/alpha/entities/r.-1.-1.mca differ diff --git a/server_alpha/alpha/entities/r.-1.0.mca b/server_alpha/alpha/entities/r.-1.0.mca index 967288d63..04441d487 100644 Binary files a/server_alpha/alpha/entities/r.-1.0.mca and b/server_alpha/alpha/entities/r.-1.0.mca differ diff --git a/server_alpha/alpha/entities/r.-1.1.mca b/server_alpha/alpha/entities/r.-1.1.mca index df7a1ac43..a476ffeef 100644 Binary files a/server_alpha/alpha/entities/r.-1.1.mca and b/server_alpha/alpha/entities/r.-1.1.mca differ diff --git a/server_alpha/alpha/entities/r.-2.-1.mca b/server_alpha/alpha/entities/r.-2.-1.mca new file mode 100644 index 000000000..e69de29bb diff --git a/server_alpha/alpha/entities/r.-2.0.mca b/server_alpha/alpha/entities/r.-2.0.mca new file mode 100644 index 000000000..0372af99b Binary files /dev/null and b/server_alpha/alpha/entities/r.-2.0.mca differ diff --git a/server_alpha/alpha/entities/r.0.-1.mca b/server_alpha/alpha/entities/r.0.-1.mca index 6b9d4e8d6..5a7003820 100644 Binary files a/server_alpha/alpha/entities/r.0.-1.mca and b/server_alpha/alpha/entities/r.0.-1.mca differ diff --git a/server_alpha/alpha/entities/r.0.0.mca b/server_alpha/alpha/entities/r.0.0.mca index 246e11089..44f41afe6 100644 Binary files a/server_alpha/alpha/entities/r.0.0.mca and b/server_alpha/alpha/entities/r.0.0.mca differ diff --git a/server_alpha/alpha/entities/r.0.1.mca b/server_alpha/alpha/entities/r.0.1.mca index c8732b9e7..d67a2a129 100644 Binary files a/server_alpha/alpha/entities/r.0.1.mca and b/server_alpha/alpha/entities/r.0.1.mca differ diff --git a/server_alpha/alpha/entities/r.0.2.mca b/server_alpha/alpha/entities/r.0.2.mca new file mode 100644 index 000000000..3451eaad6 Binary files /dev/null and b/server_alpha/alpha/entities/r.0.2.mca differ diff --git a/server_alpha/alpha/entities/r.1.-1.mca b/server_alpha/alpha/entities/r.1.-1.mca index bdca5177a..7b11d5da9 100644 Binary files a/server_alpha/alpha/entities/r.1.-1.mca and b/server_alpha/alpha/entities/r.1.-1.mca differ diff --git a/server_alpha/alpha/entities/r.1.0.mca b/server_alpha/alpha/entities/r.1.0.mca index a26aa0a1e..32cebff38 100644 Binary files a/server_alpha/alpha/entities/r.1.0.mca and b/server_alpha/alpha/entities/r.1.0.mca differ diff --git a/server_alpha/alpha/entities/r.1.1.mca b/server_alpha/alpha/entities/r.1.1.mca index 9f830da56..a3425a052 100644 Binary files a/server_alpha/alpha/entities/r.1.1.mca and b/server_alpha/alpha/entities/r.1.1.mca differ diff --git a/server_alpha/alpha/entities/r.1.2.mca b/server_alpha/alpha/entities/r.1.2.mca new file mode 100644 index 000000000..ddf73fac9 Binary files /dev/null and b/server_alpha/alpha/entities/r.1.2.mca differ diff --git a/server_alpha/alpha/entities/r.2.-1.mca b/server_alpha/alpha/entities/r.2.-1.mca index e69de29bb..3534b7784 100644 Binary files a/server_alpha/alpha/entities/r.2.-1.mca and b/server_alpha/alpha/entities/r.2.-1.mca differ diff --git a/server_alpha/alpha/entities/r.2.0.mca b/server_alpha/alpha/entities/r.2.0.mca index 16e1857fe..ee7bce034 100644 Binary files a/server_alpha/alpha/entities/r.2.0.mca and b/server_alpha/alpha/entities/r.2.0.mca differ diff --git a/server_alpha/alpha/entities/r.2.1.mca b/server_alpha/alpha/entities/r.2.1.mca index e472a153f..da54b5599 100644 Binary files a/server_alpha/alpha/entities/r.2.1.mca and b/server_alpha/alpha/entities/r.2.1.mca differ diff --git a/server_alpha/alpha/ftbchunks/f7a3413b-14d0-4c06-9196-e800c7ccf047.snbt b/server_alpha/alpha/ftbchunks/f7a3413b-14d0-4c06-9196-e800c7ccf047.snbt index 1034cffcf..52cb5fc1b 100644 --- a/server_alpha/alpha/ftbchunks/f7a3413b-14d0-4c06-9196-e800c7ccf047.snbt +++ b/server_alpha/alpha/ftbchunks/f7a3413b-14d0-4c06-9196-e800c7ccf047.snbt @@ -1,7 +1,7 @@ { max_claim_chunks: 500 max_force_load_chunks: 25 - last_login_time: 1741214431519L + last_login_time: 1747099574205L chunks: { } member_data: { f7a3413b-14d0-4c06-9196-e800c7ccf047: { diff --git a/server_alpha/alpha/level.dat b/server_alpha/alpha/level.dat index c6e3d8ad6..b46b29136 100644 Binary files a/server_alpha/alpha/level.dat and b/server_alpha/alpha/level.dat differ diff --git a/server_alpha/alpha/level.dat_old b/server_alpha/alpha/level.dat_old index 560243371..49f1ddc29 100644 Binary files a/server_alpha/alpha/level.dat_old and b/server_alpha/alpha/level.dat_old differ diff --git a/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat b/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat index 88632d3ba..ba681da20 100644 Binary files a/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat and b/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat differ diff --git a/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat_old b/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat_old index 9e6d651ed..391648159 100644 Binary files a/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat_old and b/server_alpha/alpha/playerdata/f7a3413b-14d0-4c06-9196-e800c7ccf047.dat_old differ diff --git a/server_alpha/alpha/poi/r.-2.0.mca b/server_alpha/alpha/poi/r.-2.0.mca new file mode 100644 index 000000000..e69de29bb diff --git a/server_alpha/alpha/poi/r.-2.1.mca b/server_alpha/alpha/poi/r.-2.1.mca new file mode 100644 index 000000000..e69de29bb diff --git a/server_alpha/alpha/poi/r.0.0.mca b/server_alpha/alpha/poi/r.0.0.mca index 67855fab5..565d2fcca 100644 Binary files a/server_alpha/alpha/poi/r.0.0.mca and b/server_alpha/alpha/poi/r.0.0.mca differ diff --git a/server_alpha/alpha/poi/r.0.2.mca b/server_alpha/alpha/poi/r.0.2.mca new file mode 100644 index 000000000..d284386f7 Binary files /dev/null and b/server_alpha/alpha/poi/r.0.2.mca differ diff --git a/server_alpha/alpha/poi/r.1.0.mca b/server_alpha/alpha/poi/r.1.0.mca index a7008c45c..3cfa98faa 100644 Binary files a/server_alpha/alpha/poi/r.1.0.mca and b/server_alpha/alpha/poi/r.1.0.mca differ diff --git a/server_alpha/alpha/poi/r.1.1.mca b/server_alpha/alpha/poi/r.1.1.mca index 27fdad8f5..b69f986b6 100644 Binary files a/server_alpha/alpha/poi/r.1.1.mca and b/server_alpha/alpha/poi/r.1.1.mca differ diff --git a/server_alpha/alpha/poi/r.1.2.mca b/server_alpha/alpha/poi/r.1.2.mca new file mode 100644 index 000000000..e69de29bb diff --git a/server_alpha/alpha/poi/r.2.0.mca b/server_alpha/alpha/poi/r.2.0.mca index e69de29bb..63e42dc8a 100644 Binary files a/server_alpha/alpha/poi/r.2.0.mca and b/server_alpha/alpha/poi/r.2.0.mca differ diff --git a/server_alpha/alpha/poi/r.2.1.mca b/server_alpha/alpha/poi/r.2.1.mca index 2d480e5c8..a755b3102 100644 Binary files a/server_alpha/alpha/poi/r.2.1.mca and b/server_alpha/alpha/poi/r.2.1.mca differ diff --git a/server_alpha/alpha/poi/r.3.-1.mca b/server_alpha/alpha/poi/r.3.-1.mca new file mode 100644 index 000000000..e69de29bb diff --git a/server_alpha/alpha/region/r.-1.-1.mca b/server_alpha/alpha/region/r.-1.-1.mca index 218531dee..e8f74eeb9 100755 Binary files a/server_alpha/alpha/region/r.-1.-1.mca and b/server_alpha/alpha/region/r.-1.-1.mca differ diff --git a/server_alpha/alpha/region/r.-1.0.mca b/server_alpha/alpha/region/r.-1.0.mca index 732a8da5a..b861c4cf4 100755 Binary files a/server_alpha/alpha/region/r.-1.0.mca and b/server_alpha/alpha/region/r.-1.0.mca differ diff --git a/server_alpha/alpha/region/r.-1.1.mca b/server_alpha/alpha/region/r.-1.1.mca index 13e39e58e..a68126e7e 100755 Binary files a/server_alpha/alpha/region/r.-1.1.mca and b/server_alpha/alpha/region/r.-1.1.mca differ diff --git a/server_alpha/alpha/region/r.-1.2.mca b/server_alpha/alpha/region/r.-1.2.mca new file mode 100644 index 000000000..2f1bc1f94 Binary files /dev/null and b/server_alpha/alpha/region/r.-1.2.mca differ diff --git a/server_alpha/alpha/region/r.-2.-1.mca b/server_alpha/alpha/region/r.-2.-1.mca new file mode 100644 index 000000000..825c8cca9 Binary files /dev/null and b/server_alpha/alpha/region/r.-2.-1.mca differ diff --git a/server_alpha/alpha/region/r.-2.0.mca b/server_alpha/alpha/region/r.-2.0.mca index face6420f..caa6c505c 100755 Binary files a/server_alpha/alpha/region/r.-2.0.mca and b/server_alpha/alpha/region/r.-2.0.mca differ diff --git a/server_alpha/alpha/region/r.-2.1.mca b/server_alpha/alpha/region/r.-2.1.mca index 71b3ce307..47cc7e029 100755 Binary files a/server_alpha/alpha/region/r.-2.1.mca and b/server_alpha/alpha/region/r.-2.1.mca differ diff --git a/server_alpha/alpha/region/r.0.-1.mca b/server_alpha/alpha/region/r.0.-1.mca index f597ed069..4a90738dd 100755 Binary files a/server_alpha/alpha/region/r.0.-1.mca and b/server_alpha/alpha/region/r.0.-1.mca differ diff --git a/server_alpha/alpha/region/r.0.0.mca b/server_alpha/alpha/region/r.0.0.mca index 18d147ece..ce06db511 100755 Binary files a/server_alpha/alpha/region/r.0.0.mca and b/server_alpha/alpha/region/r.0.0.mca differ diff --git a/server_alpha/alpha/region/r.0.1.mca b/server_alpha/alpha/region/r.0.1.mca index ae7c56bb7..86783ae0d 100755 Binary files a/server_alpha/alpha/region/r.0.1.mca and b/server_alpha/alpha/region/r.0.1.mca differ diff --git a/server_alpha/alpha/region/r.0.2.mca b/server_alpha/alpha/region/r.0.2.mca index 0e1f175f4..3fa18d540 100755 Binary files a/server_alpha/alpha/region/r.0.2.mca and b/server_alpha/alpha/region/r.0.2.mca differ diff --git a/server_alpha/alpha/region/r.1.-1.mca b/server_alpha/alpha/region/r.1.-1.mca index fe553079d..eded312bf 100755 Binary files a/server_alpha/alpha/region/r.1.-1.mca and b/server_alpha/alpha/region/r.1.-1.mca differ diff --git a/server_alpha/alpha/region/r.1.0.mca b/server_alpha/alpha/region/r.1.0.mca index e176baa3f..c6653ec1f 100755 Binary files a/server_alpha/alpha/region/r.1.0.mca and b/server_alpha/alpha/region/r.1.0.mca differ diff --git a/server_alpha/alpha/region/r.1.1.mca b/server_alpha/alpha/region/r.1.1.mca index 51109fc06..838d4d74a 100755 Binary files a/server_alpha/alpha/region/r.1.1.mca and b/server_alpha/alpha/region/r.1.1.mca differ diff --git a/server_alpha/alpha/region/r.1.2.mca b/server_alpha/alpha/region/r.1.2.mca index 2c34df218..2c09d9fa5 100755 Binary files a/server_alpha/alpha/region/r.1.2.mca and b/server_alpha/alpha/region/r.1.2.mca differ diff --git a/server_alpha/alpha/region/r.2.-1.mca b/server_alpha/alpha/region/r.2.-1.mca index 87d6d85c9..b7e302617 100755 Binary files a/server_alpha/alpha/region/r.2.-1.mca and b/server_alpha/alpha/region/r.2.-1.mca differ diff --git a/server_alpha/alpha/region/r.2.0.mca b/server_alpha/alpha/region/r.2.0.mca index 45081f62d..8b530e62f 100755 Binary files a/server_alpha/alpha/region/r.2.0.mca and b/server_alpha/alpha/region/r.2.0.mca differ diff --git a/server_alpha/alpha/region/r.2.1.mca b/server_alpha/alpha/region/r.2.1.mca index f67cf0632..f30cd1627 100755 Binary files a/server_alpha/alpha/region/r.2.1.mca and b/server_alpha/alpha/region/r.2.1.mca differ diff --git a/server_alpha/alpha/region/r.3.-1.mca b/server_alpha/alpha/region/r.3.-1.mca index 77333a999..0f8a1d9c7 100755 Binary files a/server_alpha/alpha/region/r.3.-1.mca and b/server_alpha/alpha/region/r.3.-1.mca differ diff --git a/server_alpha/alpha/region/r.3.0.mca b/server_alpha/alpha/region/r.3.0.mca new file mode 100644 index 000000000..c606ecc7d Binary files /dev/null and b/server_alpha/alpha/region/r.3.0.mca differ diff --git a/server_alpha/alpha/region/r.3.1.mca b/server_alpha/alpha/region/r.3.1.mca new file mode 100644 index 000000000..b0ff751b8 Binary files /dev/null and b/server_alpha/alpha/region/r.3.1.mca differ diff --git a/server_alpha/alpha/stats/f7a3413b-14d0-4c06-9196-e800c7ccf047.json b/server_alpha/alpha/stats/f7a3413b-14d0-4c06-9196-e800c7ccf047.json index 50c1b8e01..0956e53d0 100644 --- a/server_alpha/alpha/stats/f7a3413b-14d0-4c06-9196-e800c7ccf047.json +++ b/server_alpha/alpha/stats/f7a3413b-14d0-4c06-9196-e800c7ccf047.json @@ -1 +1 @@ -{"stats":{"minecraft:used":{"minecraft:stone":1,"minecraft:oak_sign":1},"minecraft:custom":{"minecraft:time_since_rest":54423,"minecraft:walk_one_cm":101364,"minecraft:leave_game":17,"minecraft:play_time":54423,"minecraft:jump":107,"minecraft:time_since_death":54423,"minecraft:interact_with_furnace":1,"minecraft:sprint_one_cm":17,"minecraft:open_chest":8,"minecraft:total_world_time":51184,"minecraft:fly_one_cm":494502,"minecraft:walk_on_water_one_cm":143,"minecraft:climb_one_cm":2295},"minecraft:picked_up":{"minecraft:oak_sign":3}},"DataVersion":4325} \ No newline at end of file +{"stats":{"minecraft:used":{"minecraft:white_bed":2,"minecraft:oak_sign":1,"minecraft:stone":1,"minecraft:lantern":5,"minecraft:grass_block":2},"minecraft:custom":{"minecraft:jump":131,"minecraft:open_chest":11,"minecraft:time_since_rest":2360,"minecraft:leave_game":25,"minecraft:play_time":69758,"minecraft:interact_with_furnace":2,"minecraft:sprint_one_cm":74,"minecraft:time_since_death":69758,"minecraft:walk_on_water_one_cm":432,"minecraft:walk_one_cm":114939,"minecraft:sleep_in_bed":1,"minecraft:total_world_time":66519,"minecraft:climb_one_cm":2603,"minecraft:walk_under_water_one_cm":295,"minecraft:fly_one_cm":798699},"minecraft:picked_up":{"minecraft:oak_sign":3,"minecraft:coal":49}},"DataVersion":3465} \ No newline at end of file diff --git a/server_alpha/automodpack/automodpack-server.json b/server_alpha/automodpack/automodpack-server.json index 1cc407a31..3e6c6a16a 100644 --- a/server_alpha/automodpack/automodpack-server.json +++ b/server_alpha/automodpack/automodpack-server.json @@ -10,21 +10,20 @@ "allowEditsInFiles": [ "/options.txt", "/config/*", - "server.properties", - "!/config/excludeThisFile" + "/server.properties" ], - "autoExcludeUnnecessaryFiles": false, + "autoExcludeUnnecessaryFiles": true, "requireAutoModpackOnClient": false, "nagUnModdedClients": true, - "nagMessage": "This server provides dedicated modpack through AutoModpack!", + "nagMessage": "AutoModpack is used to manage your mod files.", "nagClickableMessage": "Click here to get the AutoModpack!", "nagClickableLink": "https://modrinth.com/project/automodpack", - "autoExcludeServerSideMods": true, - "hostModpackOnMinecraftPort": true, + "autoExcludeServerSideMods": false, + "hostModpackOnMinecraftPort": false, "hostIp": "10.10.8.11", "hostLocalIp": "10.10.8.11", - "updateIpsOnEveryStart": false, - "hostPort": 25565, + "updateIpsOnEveryStart": true, + "hostPort": 25567, "reverseProxy": false, "selfUpdater": true, "acceptedLoaders": [ diff --git a/server_alpha/automodpack/host-modpack/main b/server_alpha/automodpack/host-modpack/main new file mode 120000 index 000000000..6c844a77d --- /dev/null +++ b/server_alpha/automodpack/host-modpack/main @@ -0,0 +1 @@ +/mnt/storage1/minecraft/mods/mods_1.20.1 \ No newline at end of file diff --git a/server_alpha/mods.openbsd/journeymap-1.20.1-5.10.3-forge.jar b/server_alpha/mods.openbsd/journeymap-1.20.1-5.10.3-forge.jar new file mode 100644 index 000000000..123d0cadd Binary files /dev/null and b/server_alpha/mods.openbsd/journeymap-1.20.1-5.10.3-forge.jar differ diff --git a/server_alpha/server.properties b/server_alpha/server.properties index 034a47978..7f5369aad 100644 --- a/server_alpha/server.properties +++ b/server_alpha/server.properties @@ -1,5 +1,5 @@ #Minecraft server properties -#Thu Apr 10 09:49:07 MST 2025 +#Tue May 13 21:51:22 MDT 2025 accepts-transfers=false allow-flight=true allow-nether=true diff --git a/server_alpha/usercache.json b/server_alpha/usercache.json index 9276d4d2b..784dc3b67 100644 --- a/server_alpha/usercache.json +++ b/server_alpha/usercache.json @@ -1 +1 @@ -[{"name":"theDevilsVoice","uuid":"f7a3413b-14d0-4c06-9196-e800c7ccf047","expiresOn":"2025-05-10 09:50:34 -0700"},{"name":"MiningAlex","uuid":"72c922ed-cf66-4567-b1c2-74e9bd718671","expiresOn":"2021-09-23 06:29:36 -0700"},{"name":"FlyAsGermanWings","uuid":"bc384491-4cf7-4185-be07-9bdb5a8310d4","expiresOn":"2021-03-23 15:33:45 -0700"},{"name":"CrowdedMountain","uuid":"633fbff3-766c-40a8-9ff0-351b3e22f212","expiresOn":"2021-04-24 18:22:44 -0700"},{"name":"Rainbovvtrap","uuid":"812cf67f-d217-49c8-8cb4-7878f3348057","expiresOn":"2021-05-11 08:57:18 -0700"},{"name":"BraunEva","uuid":"f8d6cd2c-1a89-424b-874e-892efb51d77d","expiresOn":"2021-05-24 10:17:21 -0700"},{"name":"some_garlic","uuid":"b0b291e3-463c-446d-a8b5-8d833d5b7ef8","expiresOn":"2021-05-16 13:16:18 -0700"},{"name":"Mining_Ethan","uuid":"9abbc250-e283-4450-ab7f-0cd2682279ab","expiresOn":"2021-09-23 06:29:36 -0700"}] \ No newline at end of file +[{"name":"theDevilsVoice","uuid":"f7a3413b-14d0-4c06-9196-e800c7ccf047","expiresOn":"2025-06-12 19:26:14 -0600"},{"name":"Vazkii","uuid":"8c826f34-113b-4238-a173-44639c53b6e6","expiresOn":"2025-06-12 13:53:27 -0600"},{"name":"MiningAlex","uuid":"72c922ed-cf66-4567-b1c2-74e9bd718671","expiresOn":"2021-09-23 07:29:36 -0600"},{"name":"FlyAsGermanWings","uuid":"bc384491-4cf7-4185-be07-9bdb5a8310d4","expiresOn":"2021-03-23 16:33:45 -0600"},{"name":"CrowdedMountain","uuid":"633fbff3-766c-40a8-9ff0-351b3e22f212","expiresOn":"2021-04-24 19:22:44 -0600"},{"name":"Rainbovvtrap","uuid":"812cf67f-d217-49c8-8cb4-7878f3348057","expiresOn":"2021-05-11 09:57:18 -0600"},{"name":"BraunEva","uuid":"f8d6cd2c-1a89-424b-874e-892efb51d77d","expiresOn":"2021-05-24 11:17:21 -0600"},{"name":"some_garlic","uuid":"b0b291e3-463c-446d-a8b5-8d833d5b7ef8","expiresOn":"2021-05-16 14:16:18 -0600"},{"name":"Mining_Ethan","uuid":"9abbc250-e283-4450-ab7f-0cd2682279ab","expiresOn":"2021-09-23 07:29:36 -0600"}] \ No newline at end of file diff --git a/server_minecraft/run.sh b/server_minecraft/run.sh index be21ecac1..06a7951e6 100755 --- a/server_minecraft/run.sh +++ b/server_minecraft/run.sh @@ -3,4 +3,4 @@ # Add custom JVM arguments to the user_jvm_args.txt # Add custom program arguments {such as nogui} to this file in the next line before the "$@" or # pass them to this script directly -java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.20.1-47.3.33/unix_args.txt -nogui "$@" +java @user_jvm_args.txt @libraries/net/minecraftforge/forge/1.20.1-47.4.0/unix_args.txt "$@"