small revision

[xonotic/xonotic-maps.pk3dir.git] / maps / fuse.map

diff --git a/maps/fuse.map b/maps/fuse.map
index 0dc19a2adfc57bdc435229846968d5ddd41484d7..283d8f3317ab0d42e7633b7792c9599bc8ca15e2 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -7325,12 +7325,21 @@ phillipk2x/natural-pk02_rock01
 {
 brushDef
 {
+<<<<<<< HEAD
 ( 208 -208 -448 ) ( 216 -208 -168 ) ( 200 -208 -448 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 208 -224 -448 ) ( 224 -208 -168 ) ( 208 -208 -448 ) ( ( 0.03125 0 7 ) ( 0 0.0202700961 1020.9189453125 ) ) common/clip 134217728 0 0
 ( 208 -208 -448 ) ( 200 -224 -448 ) ( 208 -224 -448 ) ( ( 0.015625 0 1.5 ) ( 0 0.015625 0.125 ) ) common/clip 134217728 0 0
 ( 208 -208 -168 ) ( 208 -224 -168 ) ( 200 -224 -448 ) ( ( 0.015625 0 254.5 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 208 -224 -168 ) ( 208 -208 -168 ) ( 224 -224 -168 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 224 -208 -64 ) ( 200 -224 -64 ) ( 224 -208 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 134217728 0 0
+=======
+( 208 -192 -448 ) ( 216 -192 -168 ) ( 200 -192 -448 ) ( ( 0.125 0 1 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
+( 208 -208 -448 ) ( 224 -192 -168 ) ( 208 -192 -448 ) ( ( 0.0625 0 13 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
+( 208 -192 -448 ) ( 200 -208 -448 ) ( 208 -208 -448 ) ( ( 0.015625 0 1.25 ) ( 0 0.015625 0.125 ) ) common/caulk 134217728 0 0
+( 208 -208 -448 ) ( 200 -208 -448 ) ( 224 -208 -168 ) ( ( 0.125 0 31 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
+( 208 -192 -168 ) ( 208 -208 -168 ) ( 200 -208 -448 ) ( ( 0.015625 0 254.75 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 208 -208 -168 ) ( 208 -192 -168 ) ( 224 -208 -168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+>>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -7401,12 +7410,21 @@ brushDef
 {
 brushDef
 {
+<<<<<<< HEAD
 ( 420 -176 -160 ) ( 420 -192 -160 ) ( 384 -192 -160 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 408 -176 -160 ) ( 384 -176 -160 ) ( 408 -176 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
 ( 382 -192 -160 ) ( 382 -176 -160 ) ( 378 -192 -168 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 255.7344665527 ) ) common/caulk 134217728 0 0
 ( 384 -192 -168 ) ( 408 -192 -168 ) ( 384 -176 -168 ) ( ( 0.0625 0 115 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
 ( 384 -192 -168 ) ( 384 -192 -160 ) ( 408 -192 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
 ( 192 -184 -168 ) ( 192 -168 -168 ) ( 192 -184 -160 ) ( ( 0.015625 0 0.375 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+=======
+( 420 -192 -160 ) ( 420 -208 -160 ) ( 384 -208 -160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 408 -192 -160 ) ( 384 -192 -160 ) ( 408 -192 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
+( 420 -208 -160 ) ( 420 -192 -160 ) ( 416 -208 -168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 384 -208 -168 ) ( 408 -208 -168 ) ( 384 -192 -168 ) ( ( 0.0625 0 116 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
+( 384 -208 -168 ) ( 384 -208 -160 ) ( 408 -208 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
+( 192 -200 -168 ) ( 192 -184 -168 ) ( 192 -200 -160 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+>>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -13415,11 +13433,19 @@ brushDef
 brushDef
 {
 ( 80 136 160 ) ( 80 128 160 ) ( 64 136 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+<<<<<<< HEAD
 ( 64 128 -128 ) ( 80 128 -128 ) ( 64 136 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 128 -128 ) ( 64 128 96 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 128 -128 ) ( 64 136 -128 ) ( 64 128 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 66 144 -64 ) ( 80 128 -64 ) ( 66 144 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 136 -64 ) ( 72 136 -64 ) ( 64 136 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+=======
+( 68 136 -128 ) ( 68 136 160 ) ( 64 136 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 68 136 160 ) ( 68 136 -128 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 64 128 -128 ) ( 80 128 -128 ) ( 64 136 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 64 128 -128 ) ( 64 128 96 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+( 64 128 -128 ) ( 64 136 -128 ) ( 64 128 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+>>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -27704,6 +27730,7 @@ brushDef
 ( -632 -1104 -320 ) ( -632 -1104 -256 ) ( -584 -1104 -320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -632 -1104 -320 ) ( -632 -1096 -320 ) ( -632 -1104 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -64 -1104 -264 ) ( -64 -1096 -256 ) ( 64 -1104 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
+<<<<<<< HEAD
 }
 }
 {
@@ -28282,6 +28309,8 @@ brushDef
 ( -1216 -832 196 ) ( -1216 -832 64 ) ( -1216 -840 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -1218 -840 64 ) ( -1216 -840 64 ) ( -1218 -832 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -1216 -840 -64 ) ( -1218 -832 -64 ) ( -1216 -840 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+=======
+>>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 }