Commit graph

2481 commits

Author SHA1 Message Date
AnonymousRandomPerson
06b3f858aa Fixed merge conflict 2022-04-10 14:14:16 -04:00
AnonymousRandomPerson
e0728154ad Merge branch 'master' into cleanup 2022-04-10 14:13:14 -04:00
AnonymousRandomPerson
951dc947f1 Updated Reddit additions 2022-04-10 14:11:00 -04:00
Cheng Hann Gan
c998920a16
Merge pull request #1202 from fabi321/nordic-union-edit
Nordic union path update
2022-04-10 14:03:15 -04:00
Cheng Hann Gan
46a883722e
Merge pull request #1204 from AnonymousRandomPerson/cleanup
Cleanup
2022-04-10 13:57:11 -04:00
AnonymousRandomPerson
5c446a52d7 Updated r/PlacePride entries 2022-04-10 13:56:26 -04:00
AnonymousRandomPerson
60d33bacc7 Updated Germany entries 2022-04-10 13:55:21 -04:00
AnonymousRandomPerson
267dc77a2a Updated more Germany entries 2022-04-10 13:55:21 -04:00
Fabian Wunsch
7183b52848 Nordic union path update
Updated the path as by https://discord.com/channels/960791635342524496/962739229971062794/962739956021878784
2022-04-10 19:22:38 +02:00
Stefano
877ca63167
Merge pull request #1177 from jaredmlemke/cleanup
Remove duplicates
2022-04-10 19:00:17 +02:00
Stefano
bffaf9f756
Merge pull request #1201 from fabi321/sami-cleanup
Cleaned up sami flag
2022-04-10 19:00:03 +02:00
Stefano
0547cf4a29
Merge pull request #1200 from fabi321/netherlands-sami-cleanup
Cleaned up netherlands-sami heart
2022-04-10 18:59:57 +02:00
Stefano
328e0d4998
Merge pull request #1199 from fabi321/shetland-heart-edit
Corrected shetland heart
2022-04-10 18:59:47 +02:00
Fabian Wunsch
967a70050b Cleaned up sami flag
duplicate of twtftt. Changed title slightly
2022-04-10 18:52:07 +02:00
Jared Lemke
72e22a049c Merge branch 'placeAtlas-cleanup' into cleanup 2022-04-10 12:46:39 -04:00
Jared Lemke
025557bca0 Merge branch 'cleanup' of https://github.com/placeAtlas/atlas into placeAtlas-cleanup 2022-04-10 12:46:04 -04:00
Fabian Wunsch
80cdf7cf3c Cleaned up netherlands-sami heart
duplicate of ty2yql
2022-04-10 18:45:23 +02:00
Fabian Wunsch
63e44aa185 Corrected shetland heart 2022-04-10 18:31:02 +02:00
Stefano
643733d732
Merge pull request #1167 from g-otn/fix/hatsune-reimu-heart
Edit request: Miku & Reimu friendship entry
2022-04-10 18:26:58 +02:00
Stefano
ea37fb5add
Merge pull request #1198 from anoadragon453/fix_contributing_doc
Fix the filenames in CONTRIBUTING.md
2022-04-10 18:24:57 +02:00
Andrew Morgan
6866354626 Fix the filenames in CONTRIBUTING.md 2022-04-10 09:18:02 -07:00
Stefano
f7985e42d6
Merge pull request #1197 from fabi321/bubatz-luigi
Cleaned up bubatz luigi
2022-04-10 18:16:26 +02:00
Stefano
eaeb04ad21
Merge pull request #1196 from anoadragon453/sgap_edit
Cleanup /r/SGaP [id: twrjah]
2022-04-10 18:16:03 +02:00
Stefano
d75c8debb6
Merge pull request #1195 from fabi321/floch-forster-cleanup
Cleanup of floch foster
2022-04-10 18:15:29 +02:00
Stefano
075c7e8230
Merge pull request #1193 from fabi321/outer-wilds-cleanup
Cleaned up outer wilds
2022-04-10 18:15:22 +02:00
Stefano
05375f09c5
Merge pull request #1192 from fabi321/fuckcars-cleanup
Cleaned up fuckcars
2022-04-10 18:15:17 +02:00
Stefano
a53c959918
Merge pull request #1191 from fabi321/melee-cleanup
Cleaned up Melee
2022-04-10 18:15:11 +02:00
Stefano
8af6ee0249
Merge pull request #1190 from fabi321/sti2d-cleanup
Cleaned up sti2d
2022-04-10 18:15:03 +02:00
Andrew Morgan
abc57b2690 Fix the description of id twrjah for /r/SGaP
Closes entry: https://old.reddit.com/r/placeAtlas2/comments/tx6xvj/edit_entry_rsgap_id_twrjah/
2022-04-10 09:11:36 -07:00
Fabian Wunsch
159d506fc4 Cleaned up bubatz luigi
I'm not 100% sure wether to keep or remove it. While it does cover
historical information, it also accuses ppl of not knowing what they are
doing. According to https://discord.com/channels/960791635342524496/962714568470179890/962715337655197737
this was an coordinated effort.
2022-04-10 18:10:47 +02:00
Fabian Wunsch
788c15bd9d Cleanup of floch foster
twvxwa is duplicate of twvgr7. Website has been a dead link. Subreddit
according to https://discord.com/channels/960791635342524496/962595490367684639/962595492959768600
2022-04-10 18:00:56 +02:00
Fabian Wunsch
6e2df71d05 Cleaned up outer wilds
duplicate of txidlw
2022-04-10 17:54:31 +02:00
Fabian Wunsch
2033dfdffa Cleaned up fuckcars
tx3pih was the least opinionated in my eyes, but the shape of 000083 was
the most accurate one.
2022-04-10 17:49:43 +02:00
Fabian Wunsch
40ee0d5eba Cleaned up Melee
somewhat duplicates of 000233. While 000233 covers a different area, it
is about the same content and covers a larger area. Furthermore it has
more background information.
2022-04-10 17:42:36 +02:00
Fabian Wunsch
c06e6eaa3a Cleaned up sti2d
duplicates of twuby0, added subreddit to it and updated the path
2022-04-10 17:36:37 +02:00
Stefano
f336349a29
Merge pull request #1189 from fabi321/portugese-cleanup
Cleaned up Portugese tiles
2022-04-10 17:27:37 +02:00
Stefano
3186eed315
Merge pull request #1181 from Rikri4009/cleanup
Removed incorrect entry (Streamlabs).
2022-04-10 17:27:26 +02:00
Stefano
30a863e7fb
Merge pull request #1188 from fabi321/belgian-flag-cleanup
Belgian flag cleanup
2022-04-10 17:27:11 +02:00
Stefano
d33d56ceda
Merge pull request #1187 from fabi321/radiance-erdtree-cleanup
Cleaned up hollow knight/elden ring
2022-04-10 17:27:05 +02:00
Stefano
50c9612302
Merge pull request #1186 from fabi321/aztec-sun-stone-cleanup
Cleaned up aztec sun stone
2022-04-10 17:26:59 +02:00
Stefano
2baf93efa0
Merge pull request #1185 from fabi321/quebec-cleanup
Cleaned up quebec
2022-04-10 17:26:49 +02:00
Fabian Wunsch
56c819b197 Cleaned up Portugese tiles
douplicates of twq34c
2022-04-10 17:26:38 +02:00
Fabian Wunsch
25fafe91f5 Belgian flag cleanup
duplicates of twtp8q
2022-04-10 17:22:59 +02:00
Fabian Wunsch
3a897f73b6 Cleaned up hollow knight/elden ring
Removed the individual entries in favour of the already existing one
2022-04-10 17:15:02 +02:00
Stefano
9c6ba13ccd
Merge pull request #1184 from Hans5958/read-ids-again
Update read-ids.txt
2022-04-10 17:10:28 +02:00
Hans5958
5a1fe28f6e Update read-ids.txt
Forgot to pull latest cleanup
2022-04-10 22:09:12 +07:00
Fabian Wunsch
0fd0950d66 Cleaned up aztec sun stone
Kept twxqta as it had the more detailed outlines, and merged
descriptions
2022-04-10 17:07:13 +02:00
Fabian Wunsch
a378964f1a Cleaned up quebec
duplicates of twwgx2
2022-04-10 17:03:58 +02:00
Stefano
4db8e85f23
Merge pull request #1183 from Hans5958/fix-recursive-adding
List ids that already been read in a seperate file
2022-04-10 16:40:57 +02:00
Stefano
c4ba61a46f
Merge branch 'master' into fix-recursive-adding 2022-04-10 16:40:42 +02:00