Commit graph

1268 commits

Author SHA1 Message Date
GeoDash897
7bc2dee415 Fix small errors 2022-04-09 20:33:56 -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
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
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
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
Aeywoo
ed6a75846c
Merge branch 'master' into cleanup 2022-04-10 04:48:02 +09:30
AlinAlexandru28
0dfbe5c0e1 Update Romanian flag description
A more detailed description of the first Romanian flag.
2022-04-09 22:13:06 +03:00
Cheng Hann Gan
6d95cefdca
Merge pull request #1154 from jarp0l/cleanup
Remove targeted hate entries
2022-04-09 14:55:15 -04:00
AnonymousRandomPerson
7e11978f24 Updated anarchy entries 2022-04-09 14:53:51 -04:00
AnonymousRandomPerson
efa1d2d396 Updated Mahjong/Wordle 2022-04-09 14:53:50 -04:00
AnonymousRandomPerson
c0c2920071 Updated gwa 2022-04-09 14:53:49 -04:00
carlyc99
05b3bec3b8 Update atlas.json 2022-04-09 11:48:07 -07:00
carlyc99
26860bb4fc Update atlas.json
Change Colombian flag description
2022-04-09 11:38:16 -07:00
Prajwol Pradhan
3c70861834 Remove hate entry targeting Real Madrid 2022-04-10 00:01:59 +05:45
Prajwol Pradhan
0781fb932f Remove hate entry targeting FC Barcelona 2022-04-10 00:01:22 +05:45
Cheng Hann Gan
38400f8393
Merge pull request #1152 from Cal3y/master
Updated description/path id: txi2a3
2022-04-09 13:41:37 -04:00
AnonymousRandomPerson
abd94274a6 Updated Reddit additions 2022-04-09 13:27:50 -04:00
Groctel
9c47b44a0a
Resolved conflicts 2022-04-09 19:10:21 +02:00
Groctel
9dc7c5a93e
Removed necroed description 2022-04-09 19:02:33 +02:00
AnonymousRandomPerson
ddd97031c2 Added missing comma 2022-04-09 13:00:27 -04:00
AnonymousRandomPerson
7ca4180c0f Merge branch 'master' into cleanup 2022-04-09 12:59:50 -04:00
AnonymousRandomPerson
e3392fd8a3 Updated Ironman Mode entries 2022-04-09 12:51:53 -04:00
Cheng Hann Gan
19dd4c9e7b
Merge pull request #1148 from jaredmlemke/cleanup
Cleanup of some duplicate entries
2022-04-09 12:48:18 -04:00
Groctel
44914c6aab
Solved cleanup conflicts 2022-04-09 16:35:34 +02:00
Hans5958
60df46e2a0
Remove duplicate 2022-04-09 20:38:05 +07:00
Jared Lemke
3068639c58 Removal of duplicate entries for BoJack Horseman 2022-04-09 09:24:39 -04:00
Jared Lemke
e816dc18fd Removal of duplicate entries for Calcifer (Howl's Moving Castle)
Kept and edited entry txeoiy.
2022-04-09 09:16:48 -04:00
Jared Lemke
5483bf65e6 Removal of duplicate entries for Spike Spiegel, Cowboy Bebop/Totoro area
Kept entries twr8c9 and twpizt.
2022-04-09 09:07:52 -04:00
Cal3y
594011e7e4
Updated description/path of id:txi2a3 2022-04-09 15:01:29 +02:00
Hans5958
4bbc7fdaea Manual edits 2022-04-09 17:28:12 +07:00
Hans5958
bdb1ccccd5 Run formatter 2022-04-09 16:34:03 +07:00
Groctel
a005161c4c
Solved cleanup conflicts 2022-04-09 11:04:36 +02:00
Groctel
1ae87e135a
Removed bad faith duplicate for SWAD 2022-04-09 11:01:36 +02:00
AnonymousRandomPerson
9a62fada50 Updated Argentina entries 2022-04-09 03:42:26 -04:00
Stefano
52d577d8d4
Merge branch 'cleanup' into cleanup 2022-04-09 09:38:00 +02:00
lchi123
c5b24dbd66
Hermitcraft face descriptions edits
Fixed some bad descriptions, corrected some which were completely incorrect, and fixed a dozen or so website links.
2022-04-08 23:41:39 -07:00