diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9685de..4c7f079 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,7 +123,6 @@ build windows i686: mkdir base mkdir base/themes cp -a ../base/themes/default base/themes/ - cp -a ../base/config.ini base/config.sample.ini cp -a ../base/serverlist.txt base/serverlist.sample.txt # Miscellaneous files diff --git a/base/background/gs4/defensedesk.png b/base/background/gs4/defensedesk.png deleted file mode 100644 index 00a3ffb..0000000 Binary files a/base/background/gs4/defensedesk.png and /dev/null differ diff --git a/base/background/gs4/prosecutiondesk.png b/base/background/gs4/prosecutiondesk.png deleted file mode 100644 index 9f62673..0000000 Binary files a/base/background/gs4/prosecutiondesk.png and /dev/null differ diff --git a/base/background/gs4/stand.png b/base/background/gs4/stand.png deleted file mode 100644 index 3719e36..0000000 Binary files a/base/background/gs4/stand.png and /dev/null differ diff --git a/base/config.ini b/base/config.ini deleted file mode 100644 index 1e8705f..0000000 --- a/base/config.ini +++ /dev/null @@ -1,10 +0,0 @@ -theme = default -blip_rate = 1 -blank_blip = false -default_music = 50 -default_sfx = 50 -default_blip = 50 -discord = true -ic_scroll_down = false -; master = master.aceattorneyonline.com -; ooc_name = Phoenix \ No newline at end of file diff --git a/base/themes b/base/themes index 49cc126..4b8496e 160000 --- a/base/themes +++ b/base/themes @@ -1 +1 @@ -Subproject commit 49cc1265f55e2939248bc1eeb6be93a8a03b9853 +Subproject commit 4b8496e7b6b0926fb9f4f6f13d86cd1da31b047a