Commit graph

271 commits

Author SHA1 Message Date
Someone Somewhere
0b83952e7c
Merge branch 'master' into patch-1 2022-04-05 12:12:05 +03:00
Someone Somewhere
d80b5d68ac
Fix unbalanced brackets 2022-04-05 12:07:06 +03:00
Someone Somewhere
c6cb146970
Merge branch 'master' into patch-1 2022-04-05 11:55:21 +03:00
Someone Somewhere
a916639310
Merge branch 'master' into patch-4 2022-04-05 11:53:11 +03:00
Someone Somewhere
7cfb298a5d
Merge branch 'master' into patch-1 2022-04-05 11:50:20 +03:00
Someone Somewhere
ee5df9ace6
Merge branch 'master' into patch-1 2022-04-05 11:48:16 +03:00
Someone Somewhere
c555a44797
Merge branch 'master' into patch-2 2022-04-05 11:43:43 +03:00
Someone Somewhere
084c81caa7
Merge branch 'master' into patch-3 2022-04-05 11:36:55 +03:00
Someone Somewhere
45f2357e27
Merge branch 'master' into patch-3 2022-04-05 11:36:36 +03:00
Aeywoo
9bbdc6c6f0
Merge branch 'master' into patch-1 2022-04-05 18:05:38 +09:30
Someone Somewhere
42a0c6c619
Merge branch 'master' into master 2022-04-05 11:33:08 +03:00
Falki
9d7ffd9d81
Update atlas.js 2022-04-05 10:28:36 +02:00
Infernio
32d840fef0 Update location of She-Ra corner
We had to rebuilt it elsewhere. Also improve description.

Broken out of #274 to make it easier to merge.
2022-04-05 10:27:11 +02:00
Oliverikx
7de07d25ef
Update atlas.js 2022-04-05 10:25:56 +02:00
Aeywoo
1211b7f48c Updated website files.
I added a Discord Button and a Discord SVG logo to the main html page of the website, added a new CSS class to make the Discord Button hover on blue instead of being yellow on hover, added a Discord banner to the contribute tab and added a link to our discord server on the bitcoin pop-out and a link to the current GitHub owners reddit user-page.
2022-04-05 17:24:38 +09:30
SkytAsul
315d1e78a3
More accurate french flag area description 2022-04-05 09:44:51 +02:00
ash
91b2bb82c1
reddit contributions and improvements to redditcrawl.py 2022-04-05 07:58:54 +01:00
Aeywoo
2690d8493f
Merge branch 'master' into patch-1 2022-04-05 15:53:50 +09:30
Aeywoo
7a700579c4
Merge branch 'master' into master 2022-04-05 15:52:49 +09:30
Aeywoo
eb47da76c1
Merge branch 'master' into patch-1 2022-04-05 15:51:45 +09:30
Aeywoo
f59e07a6fb
Merge branch 'master' into patch-1 2022-04-05 15:50:11 +09:30
Aeywoo
803685c619
Merge branch 'master' into decentm/vrcmg 2022-04-05 15:48:50 +09:30
Aeywoo
339b4fd3ba
Merge branch 'master' into patch-1 2022-04-05 15:47:43 +09:30
Aeywoo
7e1de1824a
Merge branch 'master' into patch-1 2022-04-05 15:44:13 +09:30
Aeywoo
99ecdc9b29
Merge branch 'master' into patch-1 2022-04-05 15:42:51 +09:30
Aeywoo
5ba479241e
Merge branch 'master' into decentm/vrchat 2022-04-05 15:41:43 +09:30
Aeywoo
498b6d1945
Merge branch 'master' into patch-1 2022-04-05 15:40:18 +09:30
Aeywoo
b1000c83e5
Merge branch 'master' into patch-1 2022-04-05 15:34:10 +09:30
Aeywoo
f927287375
Merge branch 'master' into master 2022-04-05 15:31:50 +09:30
Stefano Haagman
67eef29bab Netlify credits 2022-04-05 08:00:35 +02:00
Stefano Haagman
801da2df8b Merge branch 'master' of https://github.com/Codixer/place-atlas 2022-04-05 07:53:12 +02:00
Stefano Haagman
9a15b9f6c6 Lets hope this is good enough 2022-04-05 07:53:08 +02:00
Aeywoo
cda334478b
Merge branch 'master' into master 2022-04-05 14:58:57 +09:30
Aeywoo
b1cc4c2ac4
Merge branch 'master' into master 2022-04-05 14:53:01 +09:30
Stefano Haagman
630a8a515f Merge branch 'master' of https://github.com/Codixer/place-atlas 2022-04-05 07:20:25 +02:00
Stefano Haagman
c0b7657d81 This SHOULD be the latest chances 2022-04-05 07:19:00 +02:00
Aeywoo
bda1630ba5
Merge branch 'master' into patch-1 2022-04-05 14:46:59 +09:30
ShadowForests
12de95feeb
Fix Kaf website link
This updates the Kaf website link to point to the correct location
2022-04-04 22:15:17 -07:00
Aeywoo
8bbff58c11
Merge branch 'master' into patch-1 2022-04-05 14:41:05 +09:30
ShadowForests
3fb4b7063e
Fix Kaf outline
This fixes the Kaf outline to properly surround the area to include one missing 1-pixel layer of the outline
2022-04-04 22:07:48 -07:00
Aeywoo
1722c6588e
Merge branch 'master' into patch-2 2022-04-05 14:31:31 +09:30
Aeywoo
b4f6665ce3
Merge branch 'master' into patch-1 2022-04-05 14:30:29 +09:30
Aeywoo
23432707b7
Merge branch 'master' into patch-1 2022-04-05 14:29:23 +09:30
Aeywoo
303ad6bd81
Updated atlas.js
Please do not place any value higher than 0 above the first entry of atlas.js.
2022-04-05 14:27:19 +09:30
Aeywoo
eca1545c71
Merge branch 'master' into patch-1 2022-04-05 14:25:25 +09:30
Aeywoo
2ea6ff712e
Merge branch 'master' into master 2022-04-05 14:24:20 +09:30
Aeywoo
557c1e20e8
Merge branch 'master' into patch-2 2022-04-05 14:21:49 +09:30
Aeywoo
a9b88e3a3a
Updated atlas.js
Replaced an extra right curly bracket (}) with a regular right bracket (]).
2022-04-05 14:19:56 +09:30
Aeywoo
c6047b4450
Merge branch 'master' into patch-1 2022-04-05 14:17:38 +09:30
Aeywoo
c8870c9e20
Merge branch 'master' into patch-1 2022-04-05 14:15:27 +09:30