Reverted files as merge created issues

plaza-in-a-heatwave · Dec 4, 2020 · 7dcbcaa · 7dcbcaa
1 parent 56ea6c3
commit 7dcbcaa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build-release.bash b/build-release.bash
@@ -13,8 +13,8 @@ echo "* before creating the release.  *"
 echo "*********************************"
 
 # jars can have different names when released for compatibility
-CLIENTJARNAME="beta.jar"        # also remember to change this in getdown.txt
-SERVERJARNAME="beta-server.jar"
+CLIENTJARNAME="cadesim.jar"        # also remember to change this in getdown.txt
+SERVERJARNAME="cadesim-server.jar"
 
 # project dirs
 ROOT="$(realpath "$(dirname "$0")")"
@@ -38,8 +38,8 @@ CLIENTUSERDIR="$CLIENTBUILDDIR"/user
 SERVERUSERDIR="$SERVERBUILDDIR"/user
 
 # zip: one package option for user
-CLIENTZIPNAME="$CLIENTUSERDIR"/beta-client.zip
-SERVERZIPNAME="$SERVERUSERDIR"/beta-server.zip
+CLIENTZIPNAME="$CLIENTUSERDIR"/cadesim-client.zip
+SERVERZIPNAME="$SERVERUSERDIR"/cadesim-server.zip
 
 # change working directory to cadesim
 pushd "$ROOT">/dev/null

diff --git a/client-launcher/getdown.txt b/client-launcher/getdown.txt
@@ -2,7 +2,7 @@
 appbase = https://plaza-in-a-heatwave.github.io/Cadesim/beta/client/http/
 
 # UI Configuration
-ui.name = Beta CadeSim Updater
+ui.name = CadeSim Updater
 ui.icon = gclogo.png
 ui.background_image = getdown-bg.png
 ui.hide_decorations = true
@@ -13,7 +13,7 @@ ui.status = 30, 136, 364, 80
 ui.status_text = FFEC48
 
 # Application jar files
-code = beta.jar
+code = cadesim.jar
 
 # The main entry point for the application
 class = com.benberi.cadesim.desktop.DesktopLauncher

diff --git a/client-launcher/server.config b/client-launcher/server.config
@@ -1,3 +1,3 @@
 #Fri Dec 04 09:43:16 CST 2020
-server.room_locations=4998\:1627;Beta Server
+server.room_locations=4973\:5647;Room 1,4974\:9875;Room 2,4970\:1783;Room 3,4971\:2777;Room 4,4999\:6542;Room 5
 server.last_address=growup.ddns.net
diff --git a/server/getdown.txt b/server/getdown.txt
@@ -2,7 +2,7 @@
 appbase = https://plaza-in-a-heatwave.github.io/Cadesim/beta/server/http/
 
 # UI Configuration
-ui.name = Beta CadeSim Server Updater
+ui.name = CadeSim Server Updater
 ui.icon = gclogo.png
 ui.background_image = getdown-bg.png
 ui.hide_decorations = true
@@ -27,6 +27,6 @@ resource = restart_servers.py
 # getdown insists on running an app, but the server will restart itself,
 # so here we pass getdown a configuration that instantly quits
 # and allow server to handle its own restart.
-code = beta-server.jar
+code = cadesim-server.jar
 class = com.benberi.cadesim.server.service.GameServerBootstrap
 apparg = --do-nothing