diff --git a/paper/Dockerfile b/paper/Dockerfile index cb42cbd9..f1f1b052 100644 --- a/paper/Dockerfile +++ b/paper/Dockerfile @@ -1,8 +1,8 @@ # Pin to java17 -FROM itzg/minecraft-server@sha256:346cb47929edc36e977f3b064f882a9c919df65fe4807ac35c05fdacf442822f +FROM itzg/minecraft-server@sha256:491e37fa63ffef22c9ac1f6ec2fb4cc793735799cd91bafa1e5790aa39e9b313 # https://github.com/itzg/docker-minecraft-server/blob/master/README.md#versions -ENV VERSION=1.18.2 +ENV VERSION=1.20.4 # https://github.com/itzg/docker-minecraft-server#optional-plugins-mods-and-config-attach-points COPY plugins /plugins diff --git a/paper/plugins/Brewery-3.1.1.jar b/paper/plugins/Brewery-3.1.1.jar deleted file mode 100644 index e013f47a..00000000 Binary files a/paper/plugins/Brewery-3.1.1.jar and /dev/null differ diff --git a/paper/plugins/Brewery-feddff9.jar b/paper/plugins/Brewery-feddff9.jar new file mode 100644 index 00000000..cb586bd5 Binary files /dev/null and b/paper/plugins/Brewery-feddff9.jar differ diff --git a/paper/plugins/CMILib-1.1.2.5.jar b/paper/plugins/CMILib-1.1.2.5.jar deleted file mode 100644 index 93132b77..00000000 Binary files a/paper/plugins/CMILib-1.1.2.5.jar and /dev/null differ diff --git a/paper/plugins/Chunky-1.2.164.jar b/paper/plugins/Chunky-1.2.164.jar deleted file mode 100644 index b58b739d..00000000 Binary files a/paper/plugins/Chunky-1.2.164.jar and /dev/null differ diff --git a/paper/plugins/Chunky-1.3.136.jar b/paper/plugins/Chunky-1.3.136.jar new file mode 100644 index 00000000..c6b3091d Binary files /dev/null and b/paper/plugins/Chunky-1.3.136.jar differ diff --git a/paper/plugins/ChunkyBorder-1.0.64.jar b/paper/plugins/ChunkyBorder-1.0.64.jar deleted file mode 100644 index 7d3d7375..00000000 Binary files a/paper/plugins/ChunkyBorder-1.0.64.jar and /dev/null differ diff --git a/paper/plugins/ChunkyBorder-1.1.59.jar b/paper/plugins/ChunkyBorder-1.1.59.jar new file mode 100644 index 00000000..1b628127 Binary files /dev/null and b/paper/plugins/ChunkyBorder-1.1.59.jar differ diff --git a/paper/plugins/CivDuties-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/CivDuties-paper-2.0.0-SNAPSHOT.jar deleted file mode 100644 index f672aff3..00000000 Binary files a/paper/plugins/CivDuties-paper-2.0.0-SNAPSHOT.jar and /dev/null differ diff --git a/paper/plugins/DiscordSRV-Build-1.26.1.jar b/paper/plugins/DiscordSRV-Build-1.27.0.jar similarity index 87% rename from paper/plugins/DiscordSRV-Build-1.26.1.jar rename to paper/plugins/DiscordSRV-Build-1.27.0.jar index 2e62c7f4..8584da59 100644 Binary files a/paper/plugins/DiscordSRV-Build-1.26.1.jar and b/paper/plugins/DiscordSRV-Build-1.27.0.jar differ diff --git a/paper/plugins/GSit-1.4.9.jar b/paper/plugins/GSit-1.4.9.jar deleted file mode 100644 index e386bf43..00000000 Binary files a/paper/plugins/GSit-1.4.9.jar and /dev/null differ diff --git a/paper/plugins/GSit-1.8.0.jar b/paper/plugins/GSit-1.8.0.jar new file mode 100644 index 00000000..04ab5fc1 Binary files /dev/null and b/paper/plugins/GSit-1.8.0.jar differ diff --git a/paper/plugins/HolographicDisplays-3.0.0.b.3.jar b/paper/plugins/HolographicDisplays-3.0.0.b.3.jar deleted file mode 100644 index c90a0080..00000000 Binary files a/paper/plugins/HolographicDisplays-3.0.0.b.3.jar and /dev/null differ diff --git a/paper/plugins/HolographicDisplays-3.0.4.jar b/paper/plugins/HolographicDisplays-3.0.4.jar new file mode 100644 index 00000000..3b406851 Binary files /dev/null and b/paper/plugins/HolographicDisplays-3.0.4.jar differ diff --git a/paper/plugins/Insights-6.11.0.jar b/paper/plugins/Insights-6.11.0.jar deleted file mode 100644 index 5b240ddf..00000000 Binary files a/paper/plugins/Insights-6.11.0.jar and /dev/null differ diff --git a/paper/plugins/Insights-6.17.2.jar b/paper/plugins/Insights-6.17.2.jar new file mode 100644 index 00000000..35a71574 Binary files /dev/null and b/paper/plugins/Insights-6.17.2.jar differ diff --git a/paper/plugins/KiraBukkitGateway-2.0.1.jar b/paper/plugins/KiraBukkitGateway-2.0.1.jar deleted file mode 100644 index 4a61b431..00000000 Binary files a/paper/plugins/KiraBukkitGateway-2.0.1.jar and /dev/null differ diff --git a/paper/plugins/ProtocolLib-5.0.0.jar b/paper/plugins/ProtocolLib-679.jar similarity index 70% rename from paper/plugins/ProtocolLib-5.0.0.jar rename to paper/plugins/ProtocolLib-679.jar index 6280bc5e..d93f3c10 100644 Binary files a/paper/plugins/ProtocolLib-5.0.0.jar and b/paper/plugins/ProtocolLib-679.jar differ diff --git a/paper/plugins/SelectionVisualizer-3.1.1.1.jar b/paper/plugins/SelectionVisualizer-3.1.1.1.jar deleted file mode 100644 index b0dca85b..00000000 Binary files a/paper/plugins/SelectionVisualizer-3.1.1.1.jar and /dev/null differ diff --git a/paper/plugins/SuperVanish-6.2.18.jar b/paper/plugins/SuperVanish-6.2.18.jar new file mode 100644 index 00000000..e47ea83e Binary files /dev/null and b/paper/plugins/SuperVanish-6.2.18.jar differ diff --git a/paper/plugins/SuperVanish-6.2.7.jar b/paper/plugins/SuperVanish-6.2.7.jar deleted file mode 100644 index 9724b001..00000000 Binary files a/paper/plugins/SuperVanish-6.2.7.jar and /dev/null differ diff --git a/paper/plugins/TAB v4.1.2.jar b/paper/plugins/TAB v4.1.2.jar new file mode 100644 index 00000000..9ad38f58 Binary files /dev/null and b/paper/plugins/TAB v4.1.2.jar differ diff --git a/paper/plugins/TAB-3.1.1.jar b/paper/plugins/TAB-3.1.1.jar deleted file mode 100644 index 3865a086..00000000 Binary files a/paper/plugins/TAB-3.1.1.jar and /dev/null differ diff --git a/paper/plugins/Terra-bukkit-6.0.0-BETA+834404c47-shaded.jar b/paper/plugins/Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar similarity index 55% rename from paper/plugins/Terra-bukkit-6.0.0-BETA+834404c47-shaded.jar rename to paper/plugins/Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar index 4adc458d..5d141a2c 100644 Binary files a/paper/plugins/Terra-bukkit-6.0.0-BETA+834404c47-shaded.jar and b/paper/plugins/Terra-bukkit-6.4.3-BETA+ab60f14ff-shaded.jar differ diff --git a/paper/plugins/WorldEditSelectionVisualizer-2.1.5.jar b/paper/plugins/WorldEditSelectionVisualizer-2.1.5.jar new file mode 100644 index 00000000..ae5e148f Binary files /dev/null and b/paper/plugins/WorldEditSelectionVisualizer-2.1.5.jar differ diff --git a/paper/plugins/banstick-paper-2.0.1.jar b/paper/plugins/banstick-paper-2.0.1.jar index 9c75b1e3..a2557e36 100644 Binary files a/paper/plugins/banstick-paper-2.0.1.jar and b/paper/plugins/banstick-paper-2.0.1.jar differ diff --git a/paper/plugins/bastion-paper-3.0.1.jar b/paper/plugins/bastion-paper-3.0.1.jar index 8942ee98..ec1d3183 100644 Binary files a/paper/plugins/bastion-paper-3.0.1.jar and b/paper/plugins/bastion-paper-3.0.1.jar differ diff --git a/paper/plugins/citadel-paper-5.2.1.jar b/paper/plugins/citadel-paper-5.2.1.jar index 5e632ae2..40cc7fd8 100644 Binary files a/paper/plugins/citadel-paper-5.2.1.jar and b/paper/plugins/citadel-paper-5.2.1.jar differ diff --git a/paper/plugins/civchat2-paper-2.2.0.jar b/paper/plugins/civchat2-paper-2.2.0.jar index 25416bc9..7c6defee 100644 Binary files a/paper/plugins/civchat2-paper-2.2.0.jar and b/paper/plugins/civchat2-paper-2.2.0.jar differ diff --git a/paper/plugins/civduties-paper-1.5.0-SNAPSHOT.jar b/paper/plugins/civduties-paper-1.5.0-SNAPSHOT.jar new file mode 100644 index 00000000..ed20d03a Binary files /dev/null and b/paper/plugins/civduties-paper-1.5.0-SNAPSHOT.jar differ diff --git a/paper/plugins/civmodcore-paper-3.0.1.jar b/paper/plugins/civmodcore-paper-3.0.1.jar index 3265949a..e9a87324 100644 Binary files a/paper/plugins/civmodcore-paper-3.0.1.jar and b/paper/plugins/civmodcore-paper-3.0.1.jar differ diff --git a/paper/plugins/CombatTagPlus-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/combattagplus-paper-2.0.1.jar similarity index 57% rename from paper/plugins/CombatTagPlus-paper-2.0.0-SNAPSHOT.jar rename to paper/plugins/combattagplus-paper-2.0.1.jar index 29171060..2d7895b1 100644 Binary files a/paper/plugins/CombatTagPlus-paper-2.0.0-SNAPSHOT.jar and b/paper/plugins/combattagplus-paper-2.0.1.jar differ diff --git a/paper/plugins/EssenceGlue-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/essenceglue-paper-2.0.0-SNAPSHOT.jar similarity index 71% rename from paper/plugins/EssenceGlue-paper-2.0.0-SNAPSHOT.jar rename to paper/plugins/essenceglue-paper-2.0.0-SNAPSHOT.jar index 54811fa3..52ce84fb 100644 Binary files a/paper/plugins/EssenceGlue-paper-2.0.0-SNAPSHOT.jar and b/paper/plugins/essenceglue-paper-2.0.0-SNAPSHOT.jar differ diff --git a/paper/plugins/exilepearl-paper-2.1.5.jar b/paper/plugins/exilepearl-paper-2.1.5.jar index cd046b3a..d70a99f0 100644 Binary files a/paper/plugins/exilepearl-paper-2.1.5.jar and b/paper/plugins/exilepearl-paper-2.1.5.jar differ diff --git a/paper/plugins/factorymod-paper-3.1.0.jar b/paper/plugins/factorymod-paper-3.1.0.jar index f823c73e..9976f655 100644 Binary files a/paper/plugins/factorymod-paper-3.1.0.jar and b/paper/plugins/factorymod-paper-3.1.0.jar differ diff --git a/paper/plugins/finale-paper-2.1.0.jar b/paper/plugins/finale-paper-2.1.0.jar index 86f33b04..a812dd41 100644 Binary files a/paper/plugins/finale-paper-2.1.0.jar and b/paper/plugins/finale-paper-2.1.0.jar differ diff --git a/paper/plugins/HiddenOre-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/hiddenore-paper-2.0.0-SNAPSHOT.jar similarity index 54% rename from paper/plugins/HiddenOre-paper-2.0.0-SNAPSHOT.jar rename to paper/plugins/hiddenore-paper-2.0.0-SNAPSHOT.jar index a7eebf52..e7648977 100644 Binary files a/paper/plugins/HiddenOre-paper-2.0.0-SNAPSHOT.jar and b/paper/plugins/hiddenore-paper-2.0.0-SNAPSHOT.jar differ diff --git a/paper/plugins/itemexchange-paper-2.0.1.jar b/paper/plugins/itemexchange-paper-2.0.1.jar new file mode 100644 index 00000000..56852828 Binary files /dev/null and b/paper/plugins/itemexchange-paper-2.0.1.jar differ diff --git a/paper/plugins/jukealert-paper-3.0.7.jar b/paper/plugins/jukealert-paper-3.0.7.jar index 7844be47..b3dee653 100644 Binary files a/paper/plugins/jukealert-paper-3.0.7.jar and b/paper/plugins/jukealert-paper-3.0.7.jar differ diff --git a/paper/plugins/kirabukkitgateway-paper-2.0.3.jar b/paper/plugins/kirabukkitgateway-paper-2.0.3.jar new file mode 100644 index 00000000..d6097ec6 Binary files /dev/null and b/paper/plugins/kirabukkitgateway-paper-2.0.3.jar differ diff --git a/paper/plugins/NameColors-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/namecolors-paper-2.0.0.jar similarity index 56% rename from paper/plugins/NameColors-paper-2.0.0-SNAPSHOT.jar rename to paper/plugins/namecolors-paper-2.0.0.jar index 778ffa47..9c3d07e6 100644 Binary files a/paper/plugins/NameColors-paper-2.0.0-SNAPSHOT.jar and b/paper/plugins/namecolors-paper-2.0.0.jar differ diff --git a/paper/plugins/namelayer-paper-3.0.5.jar b/paper/plugins/namelayer-paper-3.0.5.jar index 6aa45d66..fcc2ac84 100644 Binary files a/paper/plugins/namelayer-paper-3.0.5.jar and b/paper/plugins/namelayer-paper-3.0.5.jar differ diff --git a/paper/plugins/orebfuscator-5.2.6.jar b/paper/plugins/orebfuscator-5.2.6.jar deleted file mode 100644 index 326f8491..00000000 Binary files a/paper/plugins/orebfuscator-5.2.6.jar and /dev/null differ diff --git a/paper/plugins/orebfuscator-plugin-5.4.3.jar b/paper/plugins/orebfuscator-plugin-5.4.3.jar new file mode 100644 index 00000000..70ac78e5 Binary files /dev/null and b/paper/plugins/orebfuscator-plugin-5.4.3.jar differ diff --git a/paper/plugins/RailSwitch-paper-2.0.0-SNAPSHOT.jar b/paper/plugins/railswitch-paper-2.0.0-SNAPSHOT.jar similarity index 58% rename from paper/plugins/RailSwitch-paper-2.0.0-SNAPSHOT.jar rename to paper/plugins/railswitch-paper-2.0.0-SNAPSHOT.jar index ad562d88..414d3843 100644 Binary files a/paper/plugins/RailSwitch-paper-2.0.0-SNAPSHOT.jar and b/paper/plugins/railswitch-paper-2.0.0-SNAPSHOT.jar differ diff --git a/paper/plugins/realisticbiomes-paper-3.2.3.jar b/paper/plugins/realisticbiomes-paper-3.2.3.jar index 3493822b..6b6bcae4 100644 Binary files a/paper/plugins/realisticbiomes-paper-3.2.3.jar and b/paper/plugins/realisticbiomes-paper-3.2.3.jar differ diff --git a/paper/plugins/simpleadminhacks-paper-2.2.5.jar b/paper/plugins/simpleadminhacks-paper-2.2.5.jar index a3a4de76..001b952f 100644 Binary files a/paper/plugins/simpleadminhacks-paper-2.2.5.jar and b/paper/plugins/simpleadminhacks-paper-2.2.5.jar differ diff --git a/paper/plugins/worldedit-7.2.10.jar b/paper/plugins/worldedit-bukkit-7.2.19.jar similarity index 63% rename from paper/plugins/worldedit-7.2.10.jar rename to paper/plugins/worldedit-bukkit-7.2.19.jar index 6ab661fe..1377679c 100644 Binary files a/paper/plugins/worldedit-7.2.10.jar and b/paper/plugins/worldedit-bukkit-7.2.19.jar differ diff --git a/waterfall/Dockerfile b/waterfall/Dockerfile index 0eb85091..1030f4fb 100644 --- a/waterfall/Dockerfile +++ b/waterfall/Dockerfile @@ -1,7 +1,7 @@ # Pin to java17 -FROM itzg/bungeecord@sha256:f67819eeefd9fe6d4ee5f6f4f3c67c171ba92e27cb22166a4abad3d1874afd4c +FROM itzg/bungeecord@sha256:7e7eeb9023cc213de2ca7ecbcf2cccc506fd46a31346f7250d2fcc5637cf5bb7 -ENV WATERFALL_VERSION=1.18 +ENV WATERFALL_VERSION=1.20 COPY config /config COPY plugins /plugins