Commit graph

2188 commits

Author SHA1 Message Date
reverb5264
16b9373f2b Conflicts fixed(?) 2022-04-09 22:33:47 -07:00
Cheng Hann Gan
31a8a5dad2
Merge pull request #1174 from AnonymousRandomPerson/cleanup
Cleanup
2022-04-09 22:50:05 -04:00
AnonymousRandomPerson
d2eaf842d6 Updated Windows taskbar entries 2022-04-09 22:49:36 -04:00
AnonymousRandomPerson
42fd28161d Updated Bermuda 2022-04-09 22:46:42 -04:00
reverb5264
28ee01cf5c Deleted NixOS duplicates 2022-04-09 19:35:46 -07:00
reverb5264
2787225f83 Deleted Hong Kong duplicates 2022-04-09 19:32:26 -07:00
reverb5264
fe6a1fd740 Deleted Deqiuv duplicates 2022-04-09 19:30:02 -07:00
reverb5264
55579f9b4c Deleted Gojo Satoru duplicates 2022-04-09 19:27:07 -07:00
reverb5264
36f9b94bc3 Deleted Infoman duplicates 2022-04-09 19:24:10 -07:00
reverb5264
a3c0b0f9a1 Deleted ARK game duplicates 2022-04-09 19:21:54 -07:00
reverb5264
f3212d7d6d Deleted Epitech duplicates 2022-04-09 19:18:11 -07:00
reverb5264
3160bbe988 Deleted r/touhou duplicates 2022-04-09 19:15:17 -07:00
reverb5264
141629fc24 Deleted Foxhole duplicates 2022-04-09 19:11:22 -07:00
carlyc99
f292648525 Punishing Gray Raven duplicate removed 2022-04-09 19:05:03 -07:00
carlyc99
5600070ae4 Grateful Dead logo duplicates 2022-04-09 19:03:03 -07:00
carlyc99
02731c8003 Pornhub link deleted 2022-04-09 19:00:22 -07:00
Cheng Hann Gan
5f71eaff36
Merge pull request #1169 from GeoDash897/cleanup
Added changes from Discord Atlas Edit threads
2022-04-09 20:36:00 -04:00
GeoDash897
7bc2dee415 Fix small errors 2022-04-09 20:33:56 -04:00
Cheng Hann Gan
d0fe9c1f32
Merge pull request #1170 from Naegles/cleanup
Edit Request: Adding extra flavour/some history to the entry for Higurashi
2022-04-09 20:30:21 -04:00
Naegles
a08f472666 Edit Request: Adding extra flavour/some history to the entry for Higurashi 2022-04-10 02:23:10 +02:00
Cheng Hann Gan
3153f4b0a3
Merge pull request #1168 from AnonymousRandomPerson/cleanup
Cleanup
2022-04-09 19:39:43 -04:00
AnonymousRandomPerson
4830f49985 Cleaned up Poland entries 2022-04-09 19:38:47 -04:00
AnonymousRandomPerson
769ec20f8d Updated LFI/Union Populaire 2022-04-09 19:38:18 -04:00
AnonymousRandomPerson
0151cc3745 Removed Sailor Mars dupe 2022-04-09 19:38:17 -04:00
AnonymousRandomPerson
7d86d57c68 Updated FC 47 2022-04-09 19:38:17 -04:00
AnonymousRandomPerson
1b932f4bed Updated Ogether 3 2022-04-09 19:38:16 -04:00
GeoDash897
b5bb462748 Merge branch 'cleanup' of github.com:GeoDash897/place-atlas into cleanup 2022-04-09 19:35:19 -04:00
Cheng Hann Gan
153111de9a
Merge pull request #1155 from carlyc99/fixups
Atlas-edits fixups (fixed)
2022-04-09 19:19:37 -04:00
carlyc99
35dea61504 Revert "Update atlas.json"
This reverts commit 05b3bec3b8.
2022-04-09 16:18:14 -07:00
Cheng Hann Gan
2827afa65e
Merge pull request #1166 from fabi321/center-cleanup
Automatic update of missaligned center
2022-04-09 18:14:23 -04:00
Cheng Hann Gan
40d2af9c11
Merge pull request #1164 from fabi321/void-cleanup
Updated void subreddit
2022-04-09 18:13:45 -04:00
Fabian Wunsch
c79f759bc3 Automatic update of missaligned center 2022-04-09 23:39:53 +02:00
Fabian Wunsch
1a8810b7a9 Updated void subreddit
as evidenced by [this](https://redd.it/ttzyoa/) theswarm is probably
responsible
2022-04-09 23:05:52 +02:00
Stefano
fa8c58164f
Merge pull request #1158 from fabi321/update-center
Update center of entries
2022-04-09 22:49:17 +02:00
Cheng Hann Gan
748a4c06d2
Merge pull request #1162 from AlinAlexandru28/master
Update Romanian flag description
2022-04-09 16:40:42 -04:00
GeoDash897
439e40a326 Merge branch 'cleanup' of github.com:GeoDash897/place-atlas into cleanup 2022-04-09 16:23:42 -04:00
Cheng Hann Gan
d506ced947
Merge pull request #1161 from fabi321/cleanup-void
Cleaned up void
2022-04-09 16:10:29 -04:00
carlyc99
47c276e098 Update atlas.json 2022-04-09 13:07:49 -07:00
carlyc99
cd5f73f83c Update atlas.json 2022-04-09 12:59:28 -07:00
carlyc99
a64e4cfa84 Revert "Update atlas.json"
This reverts commit 1e3421fa9e.
2022-04-09 12:55:51 -07:00
carlyc99
57ffc822df Revert "Update atlas.json"
This reverts commit 071cbbe0b9.
2022-04-09 12:53:35 -07:00
carlyc99
071cbbe0b9 Update atlas.json 2022-04-09 12:53:15 -07:00
carlyc99
1e3421fa9e Update atlas.json 2022-04-09 12:52:27 -07:00
Fabian Wunsch
fef80e1291 Cleaned up void 2022-04-09 21:51:42 +02:00
carlyc99
bbac32e499 Revert "Update atlas.json"
This reverts commit a44d5b53bc.
2022-04-09 12:51:25 -07:00
carlyc99
a44d5b53bc Update atlas.json 2022-04-09 12:50:31 -07:00
AlinAlexandru28
ce07c077df
Merge branch 'master' into master 2022-04-09 22:47:53 +03:00
Fabian Wunsch
93dc57d618 Small bugfix in js 2022-04-09 21:22:56 +02:00
Stefano
169a8e7d02
Merge pull request #1157 from placeAtlas/cleanup
Cleanup
2022-04-09 21:18:45 +02:00
Aeywoo
ed6a75846c
Merge branch 'master' into cleanup 2022-04-10 04:48:02 +09:30