Merge branch 'LoLlYdE-master'

This commit is contained in:
CBenni 2017-12-14 22:03:42 +01:00
commit 7395ab4985
12 changed files with 11 additions and 11 deletions

View file

@ -5,7 +5,7 @@
},
"templates": {
"bee": {
"template": "./BeeTemplate.png",
"template": "./resources/BeeTemplate.png",
"z": 0,
"anchor": {
"x": {
@ -20,7 +20,7 @@
}
},
"turtle": {
"template": "./TurtleTemplate.png",
"template": "./resources/TurtleTemplate.png",
"z": 0,
"anchor": {
"x": {
@ -35,7 +35,7 @@
}
},
"santa": {
"template": "./SantaHat.png",
"template": "./resources/SantaHat.png",
"z": 2,
"anchor": {
"x": {
@ -50,7 +50,7 @@
}
},
"birthday": {
"template": "./BirthdayHat.png",
"template": "./resources/BirthdayHat.png",
"z": 2,
"anchor": {
"x": {
@ -65,7 +65,7 @@
}
},
"dank": {
"template": "./DankHat.png",
"template": "./resources/DankHat.png",
"z": 2,
"anchor": {
"x": {
@ -80,7 +80,7 @@
}
},
"space": {
"template": "./AstronautHelmet.png",
"template": "./resources/AstronautHelmet.png",
"z": 2,
"anchor": {
"x": {
@ -96,7 +96,7 @@
}
},
"comfy": {
"template": "./ComfyTemplate.png",
"template": "./resources/ComfyTemplate.png",
"z": 2,
"anchor": {
"x": {
@ -111,7 +111,7 @@
}
},
"netneutrality": {
"template": "./NetNeutrality.png",
"template": "./resources/NetNeutrality.png",
"z": 2,
"anchor": {
"x": {
@ -127,7 +127,7 @@
}
},
"anger": {
"template": "./anger.png",
"template": "./resources/anger.png",
"z": 2,
"anchor": {
"x": {
@ -142,7 +142,7 @@
}
},
"snowglobe": {
"template": "./SnowGlobe.png",
"template": "./resources/SnowGlobe.png",
"z": 2,
"anchor": {
"x": {
@ -158,7 +158,7 @@
}
},
"ice": {
"template": "./IceCube.png",
"template": "./resources/IceCube.png",
"z": 2,
"anchor": {
"x": {

View file

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View file

Before

Width:  |  Height:  |  Size: 202 KiB

After

Width:  |  Height:  |  Size: 202 KiB

View file

Before

Width:  |  Height:  |  Size: 539 KiB

After

Width:  |  Height:  |  Size: 539 KiB

View file

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 218 KiB

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View file

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View file

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View file

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB