Commit 0d19be24 authored by Mirio's avatar Mirio

Merge branch 'master' into maddin/shader-weapclip

parents fa42f891 d3a96479
This diff was suppressed by a .gitattributes entry.
......@@ -432,7 +432,7 @@ facility114x/misc-tube
{
"classname" "misc_model"
"origin" "-192.000000 0.000000 32.000000"
"model" "xonotic-maps.pk3dir/models/lights/xonlight07.md3"
"model" "models/lights/xonlight07.md3"
"angle" "-90.000000"
"_castshadows" "1"
"_receiveshadows" "1"
......
......@@ -3,4 +3,4 @@
-light + -bounce 8
-minimap +
-sRGB
Version: 5a
Version: 6
\ No newline at end of file
......@@ -4,5 +4,4 @@ author FruitieX
cdtrack 1
noautomaplist
forbidden
gametype dm
gametype dm
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 13
Version: 14b
\ No newline at end of file
title Afterslime
description Medium sized indoor deathmatch map
author kuniu the frogg
author kuniu the frogg, t0uYK8Ne
cdtrack 12
has weapons
gametype dm
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
// mega armor above the slime pool
'214.4 -2532.4 408.0'*'158.9 -2334.6 416.0'
'158.9 -2334.6 416.0'*'214.4 -2532.4 408.0'
' 60.1 -2535.1 408.3'*'158.9 -2334.6 416.0'
'158.9 -2334.6 416.0'*' 60.1 -2535.1 408.3'
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 4b
\ No newline at end of file
Version: 5f
\ No newline at end of file
......@@ -11,8 +11,3 @@ gametype ft
gametype ka
gametype kh
gametype dom
// optional: fog density red green blue alpha mindist maxdist
// optional: settemp_for_type (all|gametypename) cvarname value
// optional: clientsettemp_for_type (all|gametypename) cvarname value
// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
// optional: hidden
This diff is collapsed.
This diff is collapsed.
// shortcut to mega health
'230.1 -877.8 536.0'*'127.7 -1151.8 440.0'
// mega armor jumppad fix
'-1577.7 1018.4 58.8'*'-1686.4 1101.0 344.0'
// devastator jumppad fix
'-546.6 361.5 186.8'*'-512.8 506.5 408.0'
'-475.2 363.4 186.7'*'-512.8 506.5 408.0'
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
-scale 0.8
-bsp +
-light + -bounce 8 -dirtscale 2
-vis +
-minimap +
-sRGB
Version: 11d
\ No newline at end of file
title Boil
description Stay calm and watch how your enemy is boiling with anger. This is the moment you know you can beat them
author kuniu the frogg, Mirio
cdtrack 22
has weapons
gametype dm
gametype tdm
gametype lms
gametype ca
gametype ft
gametype kh
gametype ka
\ No newline at end of file
'250.1 -152.6 -129.6'
'250.1 -152.6 -129.6'
0
'264.7 330.9 -78.4'
'264.7 330.9 -78.4'
0
'285.2 700.9 -78.4'
'285.2 700.9 -78.4'
0
'532.2 324.4 -78.4'
'532.2 324.4 -78.4'
0
'693.8 269.9 -72.0'
'693.8 269.9 -72.0'
0
'1155.9 775.9 24.0'
'1155.9 775.9 24.0'
0
'1158.4 509.6 24.0'
'1158.4 509.6 24.0'
0
'1142.6 145.9 24.0'
'1142.6 145.9 24.0'
0
'776.6 -347.1 228.8'
'776.6 -347.1 228.8'
0
'775.4 -643.2 228.8'
'775.4 -643.2 228.8'
0
'994.3 -696.7 228.8'
'994.3 -696.7 228.8'
0
'924.7 -702.3 -321.6'
'924.7 -702.3 -321.6'
0
'699.1 -726.9 -385.6'
'699.1 -726.9 -385.6'
0
'1015.7 -521.6 -360.0'
'1015.7 -521.6 -360.0'
0
'1104.2 -299.7 -385.6'
'1104.2 -299.7 -385.6'
0
'1155.1 -134.7 -308.8'
'1155.1 -134.7 -308.8'
0
'1137.6 133.1 -283.2'
'1137.6 133.1 -283.2'
0
'823.3 5.3 -382.4'
'823.3 5.3 -382.4'
0
'684.1 -143.2 -385.6'
'684.1 -143.2 -385.6'
0
'406.9 -181.8 -460.0'
'406.9 -181.8 -460.0'
0
'620.6 -530.8 -385.6'
'620.6 -530.8 -385.6'
0
' 30.7 -149.1 -539.2'
' 30.7 -149.1 -539.2'
0
'275.7 735.4 -436.8'
'275.7 735.4 -436.8'
0
'-170.7 553.0 -436.8'
'-170.7 553.0 -436.8'
0
'-262.7 247.5 -436.8'
'-262.7 247.5 -436.8'
0
'-311.6 -44.9 -334.4'
'-311.6 -44.9 -334.4'
0
'-303.9 -306.1 -244.8'
'-303.9 -306.1 -244.8'
0
'-190.6 -275.2 -232.0'
'-190.6 -275.2 -232.0'
0
'-117.1 -518.1 -232.0'
'-117.1 -518.1 -232.0'
0
' 21.6 706.3 11.2'
' 21.6 706.3 11.2'
0
'-205.3 457.8 24.0'
'-205.3 457.8 24.0'
0
'-392.5 -90.0 30.5'
'-392.5 -90.0 30.5'
0
'-177.9 -267.0 24.0'
'-177.9 -267.0 24.0'
0
'-111.7 617.7 24.0'
'-111.7 617.7 24.0'
0
'1136.3 404.4 24.0'
'1136.3 404.4 24.0'
0
'779.7 -511.6 228.8'
'779.7 -511.6 228.8'
0
'954.6 -596.4 228.8'
'954.6 -596.4 228.8'
0
'487.4 -695.6 228.8'
'487.4 -695.6 228.8'
0
'538.5 -351.1 -398.4'
'538.5 -351.1 -398.4'
0
'810.6 330.6 -308.8'
'810.6 330.6 -308.8'
0
'924.1 522.1 -283.2'
'924.1 522.1 -283.2'
0
'844.7 724.0 24.0'
'844.7 724.0 24.0'
0
'1133.6 -154.9 126.4'
'1133.6 -154.9 126.4'
0
'1131.7 -331.6 126.4'
'1131.7 -331.6 126.4'
0
'889.2 -355.5 228.8'
'889.2 -355.5 228.8'
0
'385.4 -755.0 -129.6'
'385.4 -755.0 -129.6'
0
'227.8 -592.1 -129.6'
'227.8 -592.1 -129.6'
0
'-237.1 -459.4 24.0'
'-237.1 -459.4 24.0'
0
This diff is collapsed.
//campaign:Xonotic 0.8.1 Campaign by Mirio
//campaign:Xonotic 0.8.2 Campaign by Mirio
//"game","mapname","bots","skill","fraglimit","timelimit","mutator-sets","description","long description"
"dm","finalrage","5","2","10",,,"Deathmatch: Final Rage","Welcome to Xonotic 0.8.1!\nWe'll start off easy with Deathmatch against 5 'Botlike' bots on Final Rage.\nXonotic is mainly a multiplayer game, but before jumping into online games it might be a good idea to practice a bit versus bots."
"dm","boil","5","2","10",,,"Deathmatch: Boil","Welcome to Xonotic!\nWe'll start off easy with Deathmatch against 5 'Botlike' bots on Boil.\nXonotic is mainly a multiplayer game, but before jumping into online games it might be a good idea to practice a bit versus bots."
"tdm","stormkeep","5","2",,"5",,"Team Deathmatch: Stormkeep","Next we'll try some 3v3 Team Deathmatch on Stormkeep.\nYou'll have to do your best for five minutes, because the team with the highest score is going to be the winning team!"
"ctf","dance","9","3","3",,,"Capture the Flag: Dance","In CTF you have to take the other teams flag and bring it to your base. Also your own flag has to be in your base for a successful capture!\n3 captures to win. "
"dm","g-23","6","3","15",,,"Deathmatch: Docking Station G-23","Again a DM match, but the bots are slightly better now."
"dm","finalrage","6","3","15",,,"Deathmatch: Final Rage","Again a DM match, but the bots are slightly better now."
"dom","atelier","11","4","50",,,"Domination: Atelier","Defend the control points and kill intruders to win."
"kh","runningmanctf","4","5","500",,,"Key Hunt: Running Man","Every team holds a key. You have to collect them (kill key holders and pick them up) and meet with the other key holder in your team."
"ctf","catharsis","13","5","5",,,"Capture the Flag: Catharsis","Another crowded CTF experience before you jump into the Multiplayer."
"dm","solarium","8","5","15",,"g_nix 1","[Special] Deathmatch: Solarium","NIX: In this mutator everyone will spawn with the same weapon, but the weapon will change randomly after some time."
"ka","runningman","6","6","15",,,"Keepaway: Running Man","Pick up the ball and frag everything that moves!\nHint: You can shoot through warpzones!"
"ctf","vorix","11","6","5",,"g_grappling_hook 1","[Special] Capture the Flag: Vorix","Grappling Hook: Press 'e' (default key) or Mouse1 to use it. Shoot it at walls and it will pull you quickly."
"rc","leave_em_behind","0","0","2400",,,"Race: Leave'em behind","It's a race, so run as fast as you can! You can try to boost yourself with the Blaster (weapon 1) if you shoot at the wall or under your feet. Also hold your Jump key to gain speed ('Bunnyhopping').\nTo proceed you need to get a time under 24 seconds."
"dm","drain","6","6","15",,"g_instagib 1","[Special] Deathmatch: Drain","InstaGib! Everyone has got one weapon - the Vaporizer.\nYour opponent will be dead if you hit him with it (unless he picked up a powerup like 'Extra Life')."
"ft","warfare","5","6","5",,,"Freeze Tag: Warfare","If you get fragged you will be freezed. You revive teammates by standing close to them for a few seconds. A round is over if an entire team is freezed."
"lms","glowplant","6","6","9",,,"Last Man Standing: Glow Plant","You will have 9 lives in this gamemode and the goal is not to run out of lives before the others do!\n= The last man standing"
"kh","runningmanctf","5","5","500",,,"Key Hunt: Running Man","Every team holds a key. You have to collect them (kill their carriers and pick them up) and meet with the other key carriers in your team."
"ctf","geoplanetary","13","5","5",,,"Capture the Flag: Geoplanetary","Another crowded CTF experience before you jump into the Multiplayer."
"dm","erbium","6","5","15",,"g_instagib 1","[Special] Deathmatch: Erbium","InstaGib! Everyone has got one weapon - the Vaporizer.\nYour opponent will be dead if you hit him with it (unless he picked up a powerup like 'Extra Life')."
"ctf","vorix","11","6","5",,"g_grappling_hook 1","[Special] Capture the Flag: Vorix","Grappling Hook: Press 'e' (default key) or Mouse5 to use it. Shoot it at walls and it will pull you quickly."
//"rc","leave_em_behind","0","0","2400",,,"Race: Leave'em behind","It's a race, so run as fast as you can! You can try to boost yourself with the Blaster (weapon 1) if you shoot at the wall or under your feet. Also hold your Jump key to gain speed ('Bunnyhopping').\nTo proceed you need to get a time under 24 seconds."
"dm","solarium","8","6","15",,"g_nix 1","[Special] Deathmatch: Solarium","NIX: In this mutator everyone will spawn with the same weapon, but the weapon will change randomly after some time."
"ft","warfare","5","6","5",,,"Freeze Tag: Warfare","If you get fragged you will be frozen. You revive teammates by standing close to them for a few seconds. A round is over if an entire team is frozen."
"lms","drain","6","6","5",,,"Last Man Standing: Drain","You will have 5 lives in this gamemode and the goal is not to run out of lives before the others do!\n= The last man standing"
"tdm","afterslime","5","7","20",,"sv_gravity 200"," [Special] Team Deathmatch: Afterslime","Another TDM match.\nThough, we lowered the gravity a little bit."
"ka","runningman","6","7","15",,,"Keepaway: Running Man","Pick up the ball and frag everything that moves!\nHint: You can shoot through warpzones!"
"nexball","nexballarena","5","7","5",,,"Nexball: Nexball Arena","This is similar to football now. You move the ball if you hit it, so try to push it into the enemies goal. First team who can score 5 goals wins!"
"kh","silentsiege","7","8","600",,,"Key Hunt: Silent Siege","Key Hunt one more time! Get 600 points to win."
"ctf","implosion","7","7","5",,"g_jetpack 1","[Special] Capture the Flag: Implosion","Jetpack: Press 'e' (default key) to use the Jetpack and enjoy flying around!"
"kh","silentsiege","8","8","600",,,"Key Hunt: Silent Siege","Key Hunt one more time! Get 600 points to win."
"ctf","implosion","7","8","5",,"g_jetpack 1","[Special] Capture the Flag: Implosion","Jetpack: Press Jump (default key 'space') while already in the air to use the Jetpack and enjoy flying around!"
//"as","techassault","7","8","30",,"g_campaign_forceteam 1","Assault: Techassault","You are in the attacking team and you have to destroy all objects. There will be new rooms/ways if you destroy an object."
"dm","oilrig","6","8","15",,,"Deathmatch: Oilrig","In this DM game you are going to face 8 'Assassin' bots!"
"cts","courtfun","0","0","6000",,,"Race CTS: Courtfun","Race CTS (Complete The Stage) is similar to the Race mode, just that you only need to reach the finish in CTS. You have to beat it within 1 minute though."
//"cts","courtfun","0","0","6000",,,"Race CTS: Courtfun","Race CTS (Complete the Stage) is similar to the Race mode, just that you only need to reach the finish in CTS. You have to beat it within 1 minute though."
"dm","xoylent","4","6","10",,"g_weaponarena blaster","[Special] Deathmatch: Xoylent","Blaster only: This time you get only the Blaster, so try to push the enemies off the map! But don't let them push you, because you need only 10 frags to win.\nWatch your step!"
"ctf","space-elevator","7","9","5",,,"Capture the Flag: Space Elevator","CTF versus a team of 'Unhuman' bots! 5 captures to win."
"ctf","catharsis","9","9","5",,,"Capture the Flag: Catharsis","CTF versus a team of 'Unhuman' bots! 5 captures to win."
"dm","darkzone","5","9","15",,"g_new_toys 1; g_cloaked 1","[Special] Deathmatch: Darkzone","New Toys: In this mutator some fancy weapons like the Mine Layer, the Heavy Laser Assault Cannon (HLAC) or the T.A.G. Seeker will spawn.\nAlso you're experiencing another mutator: almost invisible players."
"ctf","dance","7","10","3",,"g_instagib 1; g_grappling_hook 1","[Special] Capture the Flag: Dance","InstaGib in CTF this time. Also you will experience here how to play with the off-hand Grappling Hook (Press 'e' or Mouse1 to use it)!"
"dm","fuse","1","10","10",,,"[Special] Duel: Fuse","This time you will face only 1 bot - a so-called 'Duel'. Duel is very popular in the Multiplayer modus."
"dm","glowplant","5","11","20",,,"[FINAL] Deathmatch: Glow Plant","In this final match you have to beat 4 'Godlike' bots and you need to get 20 frags to win and complete the campaign! After this you should be ready for fights versus real people."
"dm","stormkeep","9","11",15",,"g_weaponarena devastator","[Bonus] Deathmatch: Stormkeep","SURPRISE!\nWelcome to the ROCKET HELL!\nOnly the Devastator will be available here - don't blow up yourself! Have fun!"
\ No newline at end of file
"ctf","space-elevator","7","10","3",,"g_instagib 1; g_grappling_hook 1","[Special] Capture the Flag: Space-Elevator","InstaGib in CTF this time. Also you will experience here how to play with the off-hand Grappling Hook (Press 'e' or Mouse5 to use it)!"
"dm","fuse","1","10","10",,,"[Special] Duel: Fuse","This time you will face only 1 bot - a so-called 'Duel'. Duel is very popular in Multiplayer."
"dm","glowplant","5","11","20",,,"[FINAL] Deathmatch: Glow Plant","In this final match you have to beat 5 'Godlike' bots and you need to get 20 frags to win and complete the campaign! After this you should be ready for fights versus real people."
"dm","stormkeep","9","11",15",,"g_weaponarena devastator","[Bonus] Deathmatch: Stormkeep","SURPRISE!\nWelcome to the ROCKET HELL!\nOnly the Devastator will be available here - don't blow up yourself! Have fun!"
// rc & cts disabled, since we hide these modes
// as disabled, because bots can't play it
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
-bsp +
-light -dirtscale 2 -bounce 8
-light + -dirtscale 2 -bounce 8
-vis +
-minimap -scale 0.9 +
-minimap + -scale 0.9
-sRGB
Version: 2c
\ No newline at end of file
Version: 4c
\ No newline at end of file
title Catharsis
description Medium-sized CTF level with crystals
author Justin
author Justin, t0uYK8Ne
cdtrack 16
has weapons
gametype ctf
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 11d
\ No newline at end of file
Version: 12c
\ No newline at end of file
......@@ -19,7 +19,7 @@ settemp_for_type rc g_pickup_rockets 8
settemp_for_type rc g_pickup_rockets_weapon 8
settemp_for_type cts g_use_ammunition 0
settemp_for_type cts g_balance_electro_weaponreplace_electro ""
settemp_for_type cts g_balance_electro_weaponreplace ""
settemp_for_type cts g_balance_mortar_weaponreplace ""
settemp_for_type cts g_balance_hagar_weaponreplace ""
settemp_for_type cts g_balance_vortex_weaponreplace ""
......@@ -35,6 +35,4 @@ settemp_for_type cts g_cts_finish_kill_delay 0
settemp_for_type ons g_powerups 0
clientsettemp_for_type all r_water 1
clientsettemp_for_type all r_water_resolutionmultiplier 1
clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting
\ No newline at end of file
clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-light + -bounce 8 -dirtscale 2 -gamma 0.7
-minimap +
-sRGB
Version: 5d
Version: 8
\ No newline at end of file
title Dance
description Very open, small sized CTF map floating above an ocean
author FruitieX, dublpaws, Debugger
author FruitieX, dublpaws, Debugger, packer
cdtrack 10
has weapons
gametype ctf
gametype kh
gametype ft
gametype ca
clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting
\ No newline at end of file
gametype ca
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
// jumppad fix
'-64.0 1510.9 -265.3'*'-242.2 1606.1 92.0'
' 64.0 -1510.9 -265.3'*'242.2 -1606.1 92.0'
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 9b
\ No newline at end of file
Version: 12b
\ No newline at end of file
title Darkzone
description Xonotic remake of a classic map from Quake1: Q1DM6. Recommended for cut-throat duels
author Cortez, CuBe0wL, SavageX
author Cortez, CuBe0wL, SavageX, Mossepo
cdtrack 15
has weapons
gametype dm
......@@ -9,12 +9,4 @@ gametype ka
gametype tdm
gametype ca
gametype kh
gametype ft
// optional: fog density red green blue alpha mindist maxdist
// optional: settemp_for_type (all|gametypename) cvarname value
// optional: clientsettemp_for_type (all|gametypename) cvarname value
// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
// optional: hidden
clientsettemp_for_type all r_shadow_realtime_world 0 // Workaround to fix problem with Realtime world lighting
\ No newline at end of file
gametype ft
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -4,4 +4,4 @@
-light + -gamma 0.75 -dirtscale 2 -bounce 8 -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
-minimap +
-sRGB
Version: 13g
Version: 14c
\ No newline at end of file
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
-bsp +
-light + -bounce 8 -dirtscale 2
-vis +
-minimap +
Version: 8f
\ No newline at end of file
title G-23
description A small DM map with tight corridors
author MooKow
cdtrack 2
title Erbium
description Industrial, nature... Duel!
author Justin, Mirio
cdtrack 21
has weapons
gametype dm
gametype lms
gametype ca
gametype kh
gametype tdm
gametype ca
gametype ft
gametype ka
hidden
\ No newline at end of file
gametype kh
gametype dom
clientsettemp_for_type all r_water 1
clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 1f
\ No newline at end of file
Version: 2c
\ No newline at end of file
title Final Rage
description Small map with brutal fast vertical action
author Munyul Verminard, tZork, L0, proraide
cdtrack 20
cdtrack 17
has weapons
gametype dm
gametype tdm
......@@ -12,6 +12,5 @@ gametype ft
gametype kh
gametype ka
clientsettemp_for_type all r_water 1
clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
// big armor
'-361.8 426.2 -40.0'*' 29.1 297.8 -40.0'
'-361.8 426.2 -40.0'*'-377.4 80.1 -40.0'
' 29.1 297.8 -40.0'*'-361.8 426.2 -40.0'
'-377.4 80.1 -40.0'*'-361.8 426.2 -40.0'
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
......@@ -3,4 +3,4 @@
-vis +
-minimap +
-sRGB
Version: 8e
\ No newline at end of file
Version: 9c
\ No newline at end of file
......@@ -3,17 +3,10 @@ description Duel Mapping Contest Winner of 2012
author Ferdinand 'cityy' List
cdtrack 4
has weapons
// uncomment this if you added turrets: has turrets
// uncomment this if you added vehicles: has vehicles
gametype dm
gametype lms
gametype ka
gametype kh
gametype ft
gametype ca
gametype tdm
// optional: fog density red green blue alpha mindist maxdist
// optional: settemp_for_type (all|gametypename) cvarname value
// optional: clientsettemp_for_type (all|gametypename) cvarname value
// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
// optional: hidden
\ No newline at end of file
gametype tdm
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
// shortcut to mortar
'-404.8 -1345.3 89.0'*'-243.8 -1527.7 -104.0'
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.