Merge branch 'master' into do-you-hear-the-voices-too

core/assets/bundles/bundle.properties

@@ -1136,6 +1136,8 @@ category.items = Items
 category.crafting = Input/Output
 category.function = Function
 category.optional = Optional Enhancements
+setting.alwaysmusic.name = Always Play Music
+setting.alwaysmusic.description = When enabled, music will always play on loop in-game.\nWhen disabled, it only plays at random intervals.
 setting.skipcoreanimation.name = Skip Core Launch/Land Animation
 setting.landscape.name = Lock Landscape
 setting.shadows.name = Shadows
@@ -1335,6 +1337,8 @@ rules.disableworldprocessors = Disable World Processors
 rules.schematic = Schematics Allowed
 rules.wavetimer = Wave Timer
 rules.wavesending = Wave Sending
+rules.allowedit = Allow Editing Rules
+rules.allowedit.info = When enabled, the player can edit rules in-game via the button in the bottom left corner of the Pause menu.
 rules.waves = Waves
 rules.airUseSpawns = Air units use spawn points
 rules.attack = Attack Mode