Merge branch 'master' into rc3-release

2021-12-27 00:51:26 +01:00 · 2021-12-27 00:51:26 +01:00 · 9ccbddd0bd
parent af0efcffe1 fa71fc260e
commit 9ccbddd0bd
4 changed files with 3 additions and 13 deletions
--- a/kreuzung/keen-rocket.json
+++ b/kreuzung/keen-rocket.json
@ -7302,16 +7302,6 @@
         "spacing":0,
         "tilecount":320,
         "tileheight":32,
-         "tiles":[
-                {
-                 "id":223,
-                 "properties":[
-                        {
-                         "name":"openWebsite",
-                         "type":"string",
-                         "value":"https:\/\/archive.org\/embed\/msdos_Commander_Keen_4_-_Secret_of_the_Oracle_1991&autoplay=1"
-                        }]
-                }],
         "tilewidth":32
        }, 
        {
--- a/main.json
+++ b/main.json
@ -64,7 +64,7 @@
                        {
                         "name":"getBadge",
                         "type":"string",
-                         "value":"csrfmiddlewaretoken=t8hlyHbYK6vD9hv2Ki4sc1stAhhfsrFlqNyp5MW1RiS8vpS4ZB &badge_class=map"
+                         "value":"t8hlyHbYK6vD9hv2Ki4sc1stAhhfsrFlqNyp5MW1RiS8vpS4ZB"
                        }],
                 "rotation":0,
                 "type":"",
--- a/zietenaugust/baumhaus.json
+++ b/zietenaugust/baumhaus.json
@ -205,7 +205,7 @@
                 "id":21,
                 "properties":[
                        {
-                         "name":"collide",
+                         "name":"collides",
                         "type":"bool",
                         "value":true
                        }]
--- a/zietenaugust/main.json
+++ b/zietenaugust/main.json
@ -379,7 +379,7 @@
                 "id":21,
                 "properties":[
                        {
-                         "name":"collide",
+                         "name":"collides",
                         "type":"bool",
                         "value":true
                        }]