From 28bc1d992b1ee596ec5c2c6c0ecd8eaefa637d95 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 26 Aug 2017 11:07:56 -0500 Subject: [PATCH 1/2] Update metastation.json --- _maps/metastation.json.rej | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 _maps/metastation.json.rej diff --git a/_maps/metastation.json.rej b/_maps/metastation.json.rej new file mode 100644 index 0000000000..bb48267f5e --- /dev/null +++ b/_maps/metastation.json.rej @@ -0,0 +1,11 @@ +diff a/_maps/metastation.json b/_maps/metastation.json (rejected hunks) +@@ -3,6 +3,6 @@ + "map_path": "map_files/MetaStation", + "map_file": "MetaStation.dmm", + "minetype": "lavaland", +- "transition_config": "default" ++ "transition_config": "default", + "allow_custom_shuttles": "yes" +-} +\ No newline at end of file ++} From 74b4133c94215cb165a07f9bb412f35e596f968a Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 29 Aug 2017 20:11:46 -0700 Subject: [PATCH 2/2] sync with upstream shouldn't break too much --- _maps/metastation.json | 3 ++- _maps/metastation.json.rej | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 _maps/metastation.json.rej diff --git a/_maps/metastation.json b/_maps/metastation.json index 4b1b63499f..aeed03a353 100644 --- a/_maps/metastation.json +++ b/_maps/metastation.json @@ -3,5 +3,6 @@ "map_path": "map_files/MetaStation", "map_file": "MetaStation.dmm", "minetype": "lavaland", - "transition_config": "default" + "transition_config": "default", + "allow_custom_shuttles": "yes" } \ No newline at end of file diff --git a/_maps/metastation.json.rej b/_maps/metastation.json.rej deleted file mode 100644 index bb48267f5e..0000000000 --- a/_maps/metastation.json.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/_maps/metastation.json b/_maps/metastation.json (rejected hunks) -@@ -3,6 +3,6 @@ - "map_path": "map_files/MetaStation", - "map_file": "MetaStation.dmm", - "minetype": "lavaland", -- "transition_config": "default" -+ "transition_config": "default", - "allow_custom_shuttles": "yes" --} -\ No newline at end of file -+}