diff --git a/defaults.yaml b/defaults.yaml index 20e836d3bf..f40786f5d9 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -41,10 +41,3 @@ Selectable: Priority: 3 Building: - -Player: - ProductionQueue: - -World: - WaterPaletteRotation: - ChronoshiftPaletteEffect: \ No newline at end of file diff --git a/merge-ra.yaml b/merge-ra.yaml new file mode 100644 index 0000000000..563e567090 --- /dev/null +++ b/merge-ra.yaml @@ -0,0 +1,6 @@ +Player: + ProductionQueue: + +World: + WaterPaletteRotation: + ChronoshiftPaletteEffect: diff --git a/ra.yaml b/ra.yaml index 430dba40e0..3e8bcf7fab 100644 --- a/ra.yaml +++ b/ra.yaml @@ -1,3 +1,10 @@ +Player: + ProductionQueue: + +World: + WaterPaletteRotation: + ChronoshiftPaletteEffect: + V2RL: Inherits: ^Vehicle Buildable: