diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 64bef7c21b..43142dc744 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -387,13 +387,11 @@ Maybe you put too many players into too small a map? = Mungkin Anda menaruh terl
 No human players selected! = Tidak ada pemain manusia yang terpilih!
 Mods: = Mod:
 Extension mods: = Mod ekstensi:
- # Requires translation!
 Base ruleset: = Aturan dasar:
 The mod you selected is incorrectly defined! = Mod yang kamu pilih tidak didefinisikan dengan benar!
 The mod combination you selected is incorrectly defined! = Campuran mod yang kamu pilih tidak didefinisikan dengan benar!
 The mod combination you selected has problems. = Campuran mod yang kamu pilih memiliki masalah.
 You can play it, but don't expect everything to work! = Kamu bisa memainkannya, tapi jangan harap semuanya bisa berjalan dengan baik!
- # Requires translation!
 This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = Aturan dasar ini tidak cocok dengan mod ekstensi\nyang dipilih sebelumnya. Aturan-aturan dasar ini telah dinonaktifkan.
 Base Ruleset = Aturan Dasar
 [amount] Techs = [amount] Teknologi
@@ -3562,9 +3560,7 @@ Railroads = Rel Kereta Api
 
 'And homeless near a thousand homes I stood, and near a thousand tables pined and wanted food.' - William Wordsworth = 'Tanpa rumah di tengah ribuan rumah aku berdiri, dan dekat ribuan meja aku merana dan menginginkan makanan.' - William Wordsworth
 Refrigeration = Pendinginan
- # Requires translation!
 'I once sent a dozen of my friends a telegram saying 'flee at once-all is discovered!' They all left town immediately.' - Mark Twain = 'Dulu aku pernah mengirimkan telegram kepada selusin teman-temanku yang mengatakan 'pergilah secepatnya-semua telah diketahui!' Mereka semua langsung meninggalkan kota.' - Mark Twain
- # Requires translation!
 Telegraph = Telegraf
 'The whole country was tied together by radio. We all experienced the same heroes and comedians and singers. They were giants.' - Woody Allen = 'Seluruh negara dipersatukan dengan radio. Kita semua mengalami saat di mana pahlawan kita, komedian kita, dan penyanyi favorit kita itu sama. Mereka adalah tokoh-tokoh besar.' - Woody Allen
 Radio = Radio
@@ -3579,9 +3575,7 @@ Pharmaceuticals = Farmasi
 Plastics = Plastik
 'There's a basic principle about consumer electronics: it gets more powerful all the time and it gets cheaper all the time.' - Trip Hawkins = 'Ada sebuah prinsip dasar untuk konsumen elektronik: ia lebih kuat setiap saat dan lebih murah setiap saat.' - Trip Hawkins
 Electronics = Elektronika
- # Requires translation!
 'The speed of communications is wondrous to behold, it is also true that speed does multiply the distribution of information that we know to be untrue.' – Edward R. Murrow = 'Kecepatan komunikasi sangat menakjubkan jika diperhatikan, hal ini sejalan juga dengan berlipatgandanya penyebaran informasi yang kita tahu bukanlah informasi yang benar.' – Edward R. Murrow
- # Requires translation!
 Mass Media = Media Massa
 'Vision is the art of seeing things invisible.' - Jonathan Swift = 'Penglihatan adalah seni melihat sesuatu yang tak kasatmata.' - Jonathan Swift
 Radar = Radar
diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties
index d8ba18e820..0f322d49b8 100644
--- a/android/assets/jsons/translations/completionPercentages.properties
+++ b/android/assets/jsons/translations/completionPercentages.properties
@@ -4,11 +4,11 @@ Russian = 94
 German = 99
 Swedish = 99
 Turkish = 76
-Ukrainian = 86
+Ukrainian = 90
 Filipino = 3
 French = 72
 Portuguese = 62
-Indonesian = 99
+Indonesian = 100
 Finnish = 44
 Spanish = 93
 Malay = 15
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 2dc98afe5c..d74632b91f 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.5.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 645
-    const val appVersion = "3.18.1"
+    const val appCodeNumber = 646
+    const val appVersion = "3.18.2"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 0016ad3041..8dfbfcd415 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,19 @@
+## 3.18.2
+
+Pre-solved potential bugs
+
+Fixed tileset config conflicts between mods
+
+Fixed crashing music bug
+
+Caught out of memory errors when updating tiles with a catch-all popup
+
+Performance improvements, should help mitigate existing ANRs
+
+Resolved crashes in game options table when changing base ruleset before the mod list was defined
+
+Fixed a crash when changing the base ruleset while in portrait mode - By xlenstra
+
 ## 3.18.1
 
 Performance improvements