Commit graph

1877 commits

Author SHA1 Message Date
Cheng Hann Gan
9696b4ae92
Merge pull request #1290 from N0ZTRA/Staryuuki
Staryuuki duplicate removal
2022-04-14 17:50:41 -04:00
Cheng Hann Gan
150f554574
Merge pull request #1289 from N0ZTRA/Flora
Flora duplicate removal
2022-04-14 17:50:22 -04:00
Cheng Hann Gan
33c6d8ee73
Merge pull request #1288 from N0ZTRA/Bill-Cipher-Cipherhunt
Bill Cipher Petrified Statue duplicate removal + Edits
2022-04-14 17:49:53 -04:00
Cheng Hann Gan
681cadabe2
Merge pull request #1286 from N0ZTRA/Puzzle-&-Dragons
Puzzle & Dragons duplicate removal + Edit
2022-04-14 17:45:33 -04:00
Cheng Hann Gan
21eed2ad96
Merge pull request #1285 from N0ZTRA/Trinidad-and-Tobago
Trinidad & Tobago duplicate removal
2022-04-14 17:45:02 -04:00
N0ZTRA
fa8801e7b7 iPandarina duplicate removals
Removes four duplicate entries for iPandarina, Spanish streamer. Leaves the one with the most information and includes their reddit link.
2022-04-14 15:46:55 -04:00
N0ZTRA
1b77d7cf3c Nigerian Flag duplicate removal
Remove two duplicate entries for the flag of Nigeria. Leaving the one with easily the most information.
2022-04-14 15:33:08 -04:00
N0ZTRA
0a2179f9d1 Ugandan Flag duplicate removal
Removes three duplicate entries for the Ugandan Flag from Forsen's twitch community. Essentially overlapping information, left well written and outlined entries for both artworks.

Remove tww4tu, twvzt3 & twvtiw
2022-04-14 15:27:34 -04:00
N0ZTRA
07149fbf52 Okayeg duplicate removals
Four entries for the twitch emote Okayeg from Nymm. Remove those with less information than the one remaining.

Also correct links. Removed twvxnw, twvpjg & twwlp2
2022-04-14 15:22:08 -04:00
N0ZTRA
c9f73837eb Lithuanian Flag duplicate removal
Remove two duplicate entries for the flag of lithuania.

Removes tx6jnh & tx4gdt
2022-04-14 15:17:11 -04:00
N0ZTRA
228861e683 The Longing duplicate removal
Exact duplicate removed. twoad0
2022-04-14 15:12:47 -04:00
N0ZTRA
7d88e9b134 ESMA duplicate removals + Edit
Four entries for ESMA art school, three are removed. The remaining one gets a small description edit for clarity.

Removed tx2v0t, tx2qas & tx41v5
Edited tx3scq
2022-04-14 15:09:58 -04:00
N0ZTRA
b5abae8f16 Annoying Dog duplicate removal + Edit
Remove a duplicate entry for Annoying Dog (Undertale). More of a joke entry than informational.

Include the barking in the remaining entry, hopefully that * doesn't conflict with \n\n.

Removed twsnp7
Edit txmlog
2022-04-14 15:05:25 -04:00
N0ZTRA
50ccc9b62d Madoka duplicate removal
Removed a duplicate entry for Kaname Madoka, include the discord link in the remaining entry.

Remove twlomc
Edit twlwh4
2022-04-14 15:00:40 -04:00
N0ZTRA
7e6bfae239 Staryuuki duplicate removal
Quick and easy of entry with one less link, exact same text.

Note this entry is not in english.
Removed tww2sy
2022-04-14 14:56:10 -04:00
N0ZTRA
5f843fb8f4 Flora duplicate removal
Three entries for character from Two Kinds webcomic Flora. Two removed because they contain less information.
Remaining one edited for the more generic name.

Removed twxaub & twxatz
Edited twxe6e
2022-04-14 14:53:26 -04:00
N0ZTRA
2ef348b007 Bill Cipher Petrified Statue duplicate removal + Edits
Two entries for the petrified statue of Bill Cipher. Left the one with the link and included information about the group who created the artwork.

Removed the alternate entry. Also edited the name and description of another Bill Cipher entry to change the 'y' from the name. Seemingly should be Cipher.

Removed tx8awo
Included new info twuitf
Edited character name txay5k
2022-04-14 14:49:23 -04:00
N0ZTRA
0711b60d9a Puzzle & Dragons duplicate removal + Edit
Three duplicate entries exist for Puzzle and Dragons. Two with less information are removed, one with very bad outlining removed.

The remaining entry has its name changed to reflect the generic game name.

Removed txamgj, txepp9 & txbiyk
Title edited for txcqje
2022-04-14 14:34:41 -04:00
N0ZTRA
7ea014457f Trinidad & Tobago duplicate removal
Three entries exist for the flag of Trinidad and Tobago. The one with the most information (contained also within the others) was left.

Removed tww19q & twvcew
Left twvt8j
2022-04-14 14:27:25 -04:00
N0ZTRA
b691ff91e3 Twice Lovely duplicate removal
Removed duplicate for TWICE Lovely entry. The remaining one contains all the information of the first plus a bit more.
Removed ID twwj2t, left twvmky.
2022-04-14 14:22:17 -04:00
Cheng Hann Gan
ff839bc09c Updated Touhou entries 2022-04-14 12:59:21 -04:00
Cheng Hann Gan
b5fa72bbe7 Updated Bernd das Brot 2022-04-14 12:10:25 -04:00
Cheng Hann Gan
0b1c0f4b4f Updated Sakarya Cevat Ayhan Fen Lisesi 2022-04-14 12:03:57 -04:00
ash
2ecaae6639
merge resolved 2022-04-14 14:47:13 +01:00
jincha89
e8acb1c57d
Merge branch 'cleanup' into cleanup 2022-04-14 09:41:16 -04:00
ash
39f9aefe89
Merge pull request #1281 from GeoDash897/cleanup
Updated various entries from Reddit
2022-04-14 14:40:57 +01:00
ash
878b17a55e
Merge pull request #1282 from Goheeca/master
Saaz hops on the Czech flag
2022-04-14 14:40:02 +01:00
mding5692
d960d5ade0 fix: remove formatting 2022-04-14 09:37:59 -04:00
mding5692
4a2199d628 fix: convert to CRLF 2022-04-14 09:18:50 -04:00
mding5692
faf19aa8e1 fix: convert back to CLRF 2022-04-14 09:10:33 -04:00
mding5692
bfd8b22bc3 merge conflict resolved 2022-04-14 08:51:45 -04:00
mding5692
d1b9304630 fix: update formatting to LF 2022-04-14 08:46:02 -04:00
Goheeca
d075b5b2bd Saaz hops 2022-04-14 10:32:43 +02:00
GeoDash897
e5a177dbee Merge branch 'cleanup' of github.com:GeoDash897/place-atlas into cleanup 2022-04-14 02:31:11 -04:00
GeoDash897
dacc4492b8 Update description of Bratishkinoff entry
I updated the entry to improve it grammar wise.
2022-04-14 02:28:08 -04:00
GeoDash897
802fc4568f Update description for Octavia entry
I updated the description to better describe the character
as well as give a bit more insight into the TwoSet collab
with MLP.
2022-04-14 02:26:59 -04:00
GeoDash897
beef0de5a8 Fix various grammar mistakes on entries
Edits in part were based on this Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u119or/error_report_a_collection_of_typos_errors_or/
2022-04-14 02:24:46 -04:00
AnonymousRandomPerson
1fe92f0699 Removed Cussy dupes 2022-04-14 01:57:42 -04:00
GeoDash897
fc2daadd24 Remove subreddit from RoboTop entry
Edits suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u1atac/fix_robotops_links/
2022-04-14 01:47:48 -04:00
GeoDash897
ba01e2904e Update description of tx0ykn entry
Edits suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u1aysd/edit_submission_hearts_of_allyship/
2022-04-14 01:41:32 -04:00
AnonymousRandomPerson
06c2f1a9c0 Updated Reddit additions 2022-04-14 01:29:09 -04:00
GeoDash897
9661d07eb5 Add Motto description of EISTI Pau entry
Edits suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u1fe7k/edit_submission_eisti_pau/

I just edited the suggestion a bit to flow better grammar wise.
2022-04-14 01:20:20 -04:00
AnonymousRandomPerson
2ad98bb252 Merge branch 'cleanup' 2022-04-14 01:19:54 -04:00
AnonymousRandomPerson
a8fdd25c78 Updated tiny penguins 2022-04-14 01:14:15 -04:00
GeoDash897
cb4756a69b Update boundaries for Beat Saber Logo entry
Edits suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u1gcpv/edit_of_the_beat_saber_logo_entry_tx27t6/
2022-04-14 01:12:47 -04:00
GeoDash897
61a1b8b28a Update Tribute to Etoiles to UIUC Kingfisher entry
Edit suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u1gpgg/edit_submission_uiuc_kingfisher/
2022-04-14 01:07:04 -04:00
AnonymousRandomPerson
90f84cbcf2 Cleaned up My Little Pony entries 2022-04-14 00:55:28 -04:00
GeoDash897
17be290ca0 Update description and boundaries of MapINK logo
Edit suggested by Reddit post-
https://www.reddit.com/r/placeAtlas2/comments/u2sv19/mapink/

I also edited the original suggested description so that it would flow
better grammar wise.
2022-04-14 00:53:10 -04:00
GeoDash897
1376d29834 Add r/Eret subreddit to Eret entry
Edit requested on Reddit-
https://www.reddit.com/r/placeAtlas2/comments/u2wma6/new_submission/
2022-04-14 00:40:32 -04:00
mding5692
4056395e42 fix: update right subreddit and description for chained woman in xuzhou 2022-04-13 23:21:49 -04:00
AnonymousRandomPerson
09f5015cca Updated Pokémon entries 2022-04-13 23:04:26 -04:00
AnonymousRandomPerson
7cdc6456f6 Updated r/TransPlace 2022-04-13 20:03:49 -04:00
AnonymousRandomPerson
80c4ad7fcf Updated Reddit additions 2022-04-13 18:58:20 -04:00
Cheng Hann Gan
bc258a24da
Merge pull request #1275 from Hoi15A/cleanup
Improve "tzkgsp" (igglepiggle) entry
2022-04-13 18:52:14 -04:00
Cheng Hann Gan
20e78de496
Merge pull request #1276 from prezmop/clean/derevert1
de-revert entry for Niko
2022-04-13 18:51:42 -04:00
AnonymousRandomPerson
141ea733eb Updated EarthBound 2022-04-13 18:24:53 -04:00
Cheng Hann Gan
0f90f2944e Updated Italy entries 2022-04-13 16:30:19 -04:00
prezmop
91750f96dc de-reverted entry 000097 (Niko) 2022-04-13 22:03:33 +02:00
Cheng Hann Gan
f01c2551b8 Updated Italy entries 2022-04-13 14:08:27 -04:00
Austin Albrecht
b2afce201f
Correct "tzkgsp" entry 2022-04-13 19:13:34 +02:00
Cheng Hann Gan
383514b50c Updated Choualbox 2022-04-13 13:06:47 -04:00
ash
38f22626b5
merge resolved 2022-04-13 14:27:09 +01:00
ash
88d4c64a9b
Merge branch 'cleanup' of github.com:placeAtlas/atlas into cleanup 2022-04-13 14:18:41 +01:00
ash
ef5fd14fff
merge resolved 2022-04-13 14:18:35 +01:00
ash
8c272a58af
Merge branch 'master' into cleanup 2022-04-13 14:10:49 +01:00
ash
df4fe4d569
cleanups 2022-04-13 14:08:03 +01:00
mxdanger
1182db5d77 Fixed newline issues 2022-04-13 00:16:10 -07:00
mxdanger
bd851f6486 Duplicate removal and path cleanup 2022-04-13 00:06:48 -07:00
AnonymousRandomPerson
eec37205c1 Cleaned up Lego/Denmark entries 2022-04-13 02:50:42 -04:00
AnonymousRandomPerson
a0e8cabd8d Updated John Dillermand 2022-04-13 01:47:21 -04:00
AnonymousRandomPerson
81db12b40d Updated Rosus 2022-04-13 01:38:40 -04:00
AnonymousRandomPerson
2071107c0d Updated Formula 1 entries 2022-04-13 01:33:26 -04:00
AnonymousRandomPerson
03db78803e Updated Yogscast entries 2022-04-13 00:46:06 -04:00
AnonymousRandomPerson
47fc22ce90 Updated Grand Rapids 2022-04-12 23:45:01 -04:00
AnonymousRandomPerson
23cdcea715 Updated India entries 2022-04-12 23:41:09 -04:00
AnonymousRandomPerson
20ed8ebf35 Updated Reddit additions 2022-04-12 22:24:58 -04:00
Cheng Hann Gan
9a66993ec4
Merge pull request #1265 from fabi321/luigi-cleanup
Cleaned up luigi
2022-04-12 22:08:55 -04:00
Cheng Hann Gan
b0c2d31b0c
Merge pull request #1261 from SpiderInMyEar/cleanup_io
Removed duplicate Territorial.io submission
2022-04-12 21:57:59 -04:00
Cheng Hann Gan
0fe3322e0c
Merge pull request #1250 from Moondarker/cleanup
Revert "Removed twthsq"
2022-04-12 21:57:32 -04:00
AnonymousRandomPerson
3ab977c5b1 Updated Minecraft entries 2022-04-12 21:14:39 -04:00
Cheng Hann Gan
1d067712c5 Updated Minecraft entries 2022-04-12 21:14:11 -04:00
Cheng Hann Gan
0ac8180631 Updated Minecraft entries 2022-04-12 21:13:45 -04:00
Fabian Wunsch
18f9d557d3 Cleaned up luigi
duplicate of u1aovf
2022-04-12 23:20:36 +02:00
SpiderInMyEar
ee85ad265f
Removed Nelson Mandela duplicate 2022-04-12 23:11:46 +02:00
SpiderInMyEar
d64b7e41b3
Removed mizutsune duplicates
Also added a dot.
2022-04-12 23:06:32 +02:00
GeoDash897
88a4319ef1 Edit Danish Queen and flag entries 2022-04-12 14:55:31 -04:00
GeoDash897
a0291cda10 Remove old location entries
Suggestion given by Eequalsmc2 and YatTheBug on the
r/placeAtlas2 discord.
2022-04-12 14:55:31 -04:00
GeoDash897
f2aa6a99ef Remove misplaced People's Republic of China flag 2022-04-12 14:55:30 -04:00
GeoDash897
3e5ebbb5a8 Update subreddits for various Nordic entries
Suggestion given by Eequalsmc2 on the r/placeAtlas2 discord
2022-04-12 14:55:30 -04:00
GeoDash897
57cd4ab644 Add subreddit /r/TeosGame to txfq41
Suggestion given b Eequalsmc2 on the r/placeAtlas2 discord
2022-04-12 14:55:30 -04:00
GeoDash897
d22d67392e Improve John Dillermand's entry
I removed the shorter John Dillermand entry that was originally
on the altas and updated the description that combined both
of the intial entries. Alongside this, I updated the boundary
box for the art using the coordinates given by Eesqualsmc2
on the r/placeAtlas2 discord.
2022-04-12 14:55:30 -04:00
GeoDash897
f786401a6f Remove Kaaba duplicate (id:000304)
Suggestion given by Eequalsmc2 on the r/placeAtlas
2022-04-12 14:55:14 -04:00
SpiderInMyEar
390422a9a3
Removed duplicate Territorial.io submission
per request: https://discord.com/channels/960791635342524496/963510253729763379
2022-04-12 20:52:44 +02:00
Nicolas Abram
fd29d52a24
Merge pull request #1258 from reverb5264/fixups 2022-04-12 15:35:06 -03:00
Nicolas Abram
b4e4b80b31
Merge pull request #1256 from prezmop/clean/linux
Linux distribution entry cleanup
2022-04-12 15:25:41 -03:00
Nicolas Abram
040e133ca9
Merge pull request #1257 from SpiderInMyEar/cleanup_dup
Cleaned up duplicates
2022-04-12 15:23:52 -03:00
ash
1ba1f47213
Update atlas.json 2022-04-12 19:20:20 +01:00
Nicolas Abram
1b8cf3410f
Merge pull request #1259 from prezmop/clean/niko
cleanup around the Austrian flag
2022-04-12 15:19:15 -03:00
ash
f94c45ef16
cleanups 2022-04-12 19:06:20 +01:00
ash
594466e722
cleanups 2022-04-12 18:55:52 +01:00
prezmop
4813eddae8 updated border for oida 2022-04-12 19:44:33 +02:00
prezmop
079be68163 updated border for Lea 2022-04-12 19:41:38 +02:00
reverb5264
511a3ab90b Merge remote-tracking branch 'upstream/cleanup' into fixups 2022-04-12 10:41:15 -07:00
prezmop
6f73bdc5aa updated description for Niko 2022-04-12 19:36:55 +02:00
reverb5264
dbc857f1e2 Removed txhiq9
Per https://discord.com/channels/960791635342524496/961580167866773545/961580172023320607
2022-04-12 10:33:38 -07:00
reverb5264
c92f37ce5a Removed New Order dupe
Per https://discord.com/channels/960791635342524496/961328578308493383/961328902440095814
2022-04-12 10:32:39 -07:00
SpiderInMyEar
ca3abc794b
Cleaned up duplicates
Also removed enthusiasm from the Jebediah Kerman entry.
2022-04-12 19:15:47 +02:00
prezmop
38112ab4ef removed GNU/Linux from debian
debian can be used with non-linux kernels
2022-04-12 18:46:24 +02:00
prezmop
b8223bd57d dedupe Raspberry pi 2022-04-12 18:42:54 +02:00
prezmop
bc3d373e3e deduped KDE 2022-04-12 18:40:50 +02:00
prezmop
ae6cc0a700 deduped Debian 2022-04-12 18:30:36 +02:00
prezmop
9a8aa10c61 corrected the name of Pop!_OS 2022-04-12 18:18:33 +02:00
prezmop
58bca30bcd deduped Alpine Linux 2022-04-12 18:16:53 +02:00
prezmop
cb09f7ef89 deduped Pop!OS 2022-04-12 18:05:55 +02:00
prezmop
8c1706d0e1 deduped OpenSUSE 2022-04-12 18:04:34 +02:00
SpiderInMyEar
325286524a
Cleaned up webserial area
Redrew Sve noc submission to hopefully have little overlap with Jagganoth.
Edited description of Roxy to better reflect Mushoku Tensei's status as an OG Web novel.
Added information on the TWI duck that was lost from deleting duplicates.
2022-04-12 17:46:15 +02:00
prezmop
95f468395c deduped entries for Arch Linux 2022-04-12 17:39:58 +02:00
prezmop
a51c6a585a deduped bedrock linux entries 2022-04-12 17:30:23 +02:00
ash
85fdccf649
Merge pull request #1252 from placeAtlas/master
update cleanup
2022-04-12 13:42:13 +01:00
AnonymousRandomPerson
74d82b7c4a Cleaned up Minecraft entries 2022-04-12 02:09:52 -04:00
AnonymousRandomPerson
eb07a085e1 Updated osu! coordinates 2022-04-11 21:21:29 -04:00
AnonymousRandomPerson
46b4abd41e Updated Shovel Knight entries 2022-04-11 21:14:15 -04:00
AnonymousRandomPerson
8c5c0b7b02 Updated Orange Juice Juice 2022-04-11 21:01:58 -04:00
AnonymousRandomPerson
a4ba8b93df Updated Hololive entries 2022-04-11 19:34:13 -04:00
AnonymousRandomPerson
4132292d23 Removed Battle of the Heroes dupe 2022-04-11 19:34:12 -04:00
AnonymousRandomPerson
df24f87152 Updated The Night Watch and League of Pixels 2022-04-11 19:34:12 -04:00
AnonymousRandomPerson
7564178829 Updated Star Wars and Gol D. Roger 2022-04-11 19:34:11 -04:00
AnonymousRandomPerson
d7859d07d6 Updated Hololive 2022-04-11 19:34:10 -04:00
Cheng Hann Gan
846de45f8a
Merge pull request #1245 from prezmop/cleanup-austria
removed duplicate entry for Austria
2022-04-11 19:32:59 -04:00
Moondarker
5752521540 Revert "Removed twthsq"
This reverts commit 9829517525.
2022-04-12 02:23:37 +03:00
prezmop
24e5e3e544 removed duplicate entry for Austria 2022-04-12 01:21:50 +02:00
prezmop
5988ea7f9e merged niko entries, new bounduaries, corrected wrong info 2022-04-12 00:59:05 +02:00
AnonymousRandomPerson
db7200b8ba Updated Reddit additions 2022-04-11 17:29:02 -04:00
onnowhere
da7ac9594f
Cleanup Minecraft Map-Making related communities 2022-04-11 11:41:45 -07:00
ash
6872e38358
Merge pull request #1240 from SpiderInMyEar/cleanup
Removed duplicate CS:S Missing submissions.
2022-04-11 18:39:45 +01:00
SpiderInMyEar
9a0b8674ae
Removed duplicate CS:S Missing submissions.
Also added a paragraph to the last submission.
2022-04-11 18:42:30 +02:00
Fincent7
50aa52c4fd merged two entries 2022-04-11 18:14:59 +02:00
Fincent7
3385afde51 merged some more entries 2022-04-11 18:06:40 +02:00
Fincent7
e0d0c1b064 merged some entries 2022-04-11 17:58:54 +02:00
Fincent7
4c53134916 merged two entries 2022-04-11 17:47:34 +02:00
Fincent7
ef120cafaf merged two entries 2022-04-11 17:40:57 +02:00
Fincent7
35f038d536 merged some entries 2022-04-11 17:34:49 +02:00
ash
6937f316f3
Merge pull request #1230 from SpiderInMyEar/cleanup
Removed duplicate Tomiii 11 submission
2022-04-11 14:57:09 +01:00
ash
8af6b4abaa
Merge pull request #1234 from placeAtlas/master
Merge
2022-04-11 14:56:47 +01:00
SpiderInMyEar
7bb146279b
Removed duplicate Tomiii 11 submission
Also added duplicate's additional info into the remaining entry.
2022-04-11 14:52:26 +02:00
SpiderInMyEar
cf1926b509
Removed several duplicates in Read Web Serial area
removed a few K6BD duplicates, a TWI duplicate, and a Pale duplicate, as well a main page duplicate.
2022-04-11 12:38:22 +02:00
AnonymousRandomPerson
506fde036c Merge branch 'cleanup' 2022-04-11 02:23:28 -04:00
AnonymousRandomPerson
6a220c13c1 Updated Reddit additions 2022-04-11 02:22:55 -04:00
AnonymousRandomPerson
cd9c6c146a Cleaned up Hololive entries 2022-04-11 02:18:06 -04:00
AnonymousRandomPerson
a8e354b4bc Updated Aphex Twin 2022-04-11 02:18:06 -04:00
AnonymousRandomPerson
bba6a22428 Updated Katawa Shoujo entries 2022-04-11 02:18:06 -04:00
AnonymousRandomPerson
ba73a705b0 Updated Don't Starve entries 2022-04-11 02:18:05 -04:00
AnonymousRandomPerson
24c6bffb67 Updated Genshin Impact entries 2022-04-11 00:28:35 -04:00
AnonymousRandomPerson
b1892ee52a Cleaned up Naruto entries 2022-04-11 00:28:33 -04:00
AnonymousRandomPerson
a4c935772f Updated small duck 2022-04-11 00:28:31 -04:00
AnonymousRandomPerson
946687c9a8 Updated OneShotMason 2022-04-11 00:28:30 -04:00
Cheng Hann Gan
f01c4f998d
Merge pull request #1221 from Wayland-Smithy/fix-id-zero
Fix errant numerical id
2022-04-10 23:07:47 -04:00
Cheng Hann Gan
94be156519
Merge pull request #1219 from jakeohutchins/cleanup
Removed duplicate Foolish Gamers shark
2022-04-10 23:07:18 -04:00
Wayland-Smithy
a89e4fede4
Merge branch 'cleanup' into fix-id-zero 2022-04-10 20:01:24 -07:00
Wayland-Smithy
da994c904b zero to hero 2022-04-10 19:58:39 -07:00
AnonymousRandomPerson
20aa01740a Updated Philippines entries 2022-04-10 22:57:21 -04:00
AnonymousRandomPerson
87738bd155 Updated NexxuzHD 2022-04-10 22:57:21 -04:00
AnonymousRandomPerson
0b8d27c9b3 Updated Encanto 2022-04-10 22:57:21 -04:00
AnonymousRandomPerson
ed6078e798 Updated Paluders 2022-04-10 22:57:20 -04:00
AnonymousRandomPerson
43b957350c Updated Widowmaker 2022-04-10 22:57:20 -04:00
AnonymousRandomPerson
c379693e99 Updated artiso 2022-04-10 22:57:20 -04:00
jakeohutchins
1340421f43 Removed duplicate Foolish Gamers shark 2022-04-10 22:36:41 -04:00
AnonymousRandomPerson
a41fb1f2c2 Updated Texas A&M entries 2022-04-10 21:07:43 -04:00
AnonymousRandomPerson
3055047aef Updated Neopets entries 2022-04-10 21:07:42 -04:00
AnonymousRandomPerson
943ca25e31 Updated neoliberal/NCD 2022-04-10 21:07:42 -04:00
AnonymousRandomPerson
ea5bd91aa9 Updated Homestuck entries 2022-04-10 21:07:40 -04:00
AnonymousRandomPerson
42708cd322 Updated Haunted Mound 2022-04-10 21:07:40 -04:00
AnonymousRandomPerson
c8d57f3091 Updated e621 2022-04-10 21:07:39 -04:00
AnonymousRandomPerson
c92595ef09 Updated Magnus Carlsen 2022-04-10 21:07:38 -04:00
AnonymousRandomPerson
ba1527de10 Cleaned up dupes 2022-04-10 21:07:37 -04:00
reverb5264
77126d694d Removed UIUC dupes 2022-04-10 15:11:05 -07:00
reverb5264
e83d2e1d0c Removed Norm Macdonald dupes 2022-04-10 15:07:55 -07:00
reverb5264
d4d55ab237 Removed NOAA dupes 2022-04-10 15:05:51 -07:00
reverb5264
3c16a07218 Removed Feddy dupes 2022-04-10 15:04:12 -07:00
reverb5264
79fd9ec4fe Removed Necati dupes 2022-04-10 15:02:48 -07:00
reverb5264
ddda629ad5 Removed Kirby Lesbian Pride Warp Star dupes 2022-04-10 15:00:27 -07:00
reverb5264
ae5f0bc353 Removed Novelhouse dupes 2022-04-10 14:58:24 -07:00
reverb5264
acb2e35da0 Removed pepeSmoke dupes 2022-04-10 14:57:02 -07:00
reverb5264
db8c39395d Removed Rosus dupes 2022-04-10 14:55:14 -07:00
reverb5264
bdad50ce44 Removed Pomu Rainpuff dupes 2022-04-10 14:53:38 -07:00
reverb5264
72d69d5001 Removed 808s and Heartbreak dupes 2022-04-10 14:51:29 -07:00
reverb5264
93ebef93c1 Removed University of Philippines dupes 2022-04-10 14:47:45 -07:00
reverb5264
0b45884d8b Removed Rice University dupes 2022-04-10 14:46:30 -07:00
reverb5264
327495db9e Removed Xuzhou chained woman dupes 2022-04-10 14:44:21 -07:00
reverb5264
31c6c13d32 Removed Tank Man dupes 2022-04-10 14:42:43 -07:00
reverb5264
b7226bcb9a Removed James Webb Telescope Dupes 2022-04-10 14:41:54 -07:00
reverb5264
2baafe603c Removed Getting Over It dupes 2022-04-10 14:40:52 -07:00
reverb5264
2c66549fb0 Removed Sora dupes 2022-04-10 14:39:30 -07:00
reverb5264
dbea35a79b Merge remote-tracking branch 'upstream/cleanup' into fixups 2022-04-10 14:37:16 -07:00
reverb5264
c484a47f9a Removed HeyarTV dupes 2022-04-10 14:32:59 -07:00
Cheng Hann Gan
c119e72097
Merge pull request #1209 from fabi321/neoliberal-ncd-cleanup
Cleanup of NATO/NCD
2022-04-10 17:32:36 -04:00
reverb5264
8630e25491 Removed Bill Cipher dupes 2022-04-10 14:32:07 -07:00
Fabian Wunsch
db782eab03 Added NATO Flag again 2022-04-10 23:30:58 +02:00
reverb5264
68d7c716cd Removed Belgian Flag dupes 2022-04-10 14:30:48 -07:00
Stefano
b912f19821
Merge pull request #1214 from Zanthed/remove-website
Remove website from tz0amd per private discussions
2022-04-10 23:30:09 +02:00
reverb5264
afc08398a4 Removed Socki dupes 2022-04-10 14:29:35 -07:00
Cheng Hann Gan
7396849108
Merge pull request #1212 from fabi321/the-mole-cleanup
Cleaned up the mole
2022-04-10 17:29:13 -04:00
June
755696b216 Remove website from tz0amd per private discussions
Signed-off-by: June <june@eridan.me>
2022-04-10 17:28:15 -04:00
reverb5264
c52a00b2dd Removed Mario Star dupes 2022-04-10 14:27:19 -07:00
AnonymousRandomPerson
dd2c53b334 Cleaned up USA entries 2022-04-10 17:26:09 -04:00
AnonymousRandomPerson
48ac85288e Cleaned up Brazil entries 2022-04-10 17:26:09 -04:00
AnonymousRandomPerson
1836040068 Updated Argentina entries 2022-04-10 17:26:09 -04:00
AnonymousRandomPerson
618e36ee5a Updated Nordic Union entries 2022-04-10 17:26:09 -04:00
AnonymousRandomPerson
8bf19b4f7a Cleaned up France entries 2022-04-10 17:26:09 -04:00
AnonymousRandomPerson
277403381b Cleaned up Germany entries 2022-04-10 17:26:09 -04:00
Fabian Wunsch
893ea1c494 Cleaned up the mole
duplicate of txo1lq, but the path of 000081 was better
2022-04-10 22:38:45 +02:00
AnonymousRandomPerson
fa05beb2df Updated Nordic Union entries 2022-04-10 16:02:47 -04:00
AnonymousRandomPerson
436e998ff1 Updated Dofus entries 2022-04-10 16:02:46 -04:00
AnonymousRandomPerson
bc591ac9cc Updated upper France entries 2022-04-10 16:02:46 -04:00
AnonymousRandomPerson
810e104948 Updated southern Argentina entries 2022-04-10 16:02:46 -04:00
Fabian Wunsch
4b754ff54a Cleanup of NATO/NCD
duplicates of twlj1s. Partially malicious
2022-04-10 21:41:39 +02:00
AnonymousRandomPerson
6560386d6a Updated Reddit additions 2022-04-10 14:24:07 -04:00
Nicolas Abram
f582b19e75
Merge branch 'master' into master 2022-04-10 15:19:20 -03:00
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
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
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
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
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
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
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
6cc8c488fa
Merge pull request #1146 from GitFincy/cleanup
cleanup, atlas edit requests, duplicate entries, etc
2022-04-10 15:28:31 +02:00
SpiderInMyEar
fa009a155a
Updated Read Web Serial's area
Removed 3 duplicate submissions for the Read Web Serial area.
Re-wrote the last submission.

The first of several edits to hopefully pretty up this area. Some information from removed submissions will temporarily be lost, but i plan on making submissions for whats missing, so it wont be permanent.
2022-04-10 12:29:27 +02:00
Rikri4009
b7c23480ae
Removed incorrect entry (Streamlabs). 2022-04-10 03:22:43 -07:00
Fincent7
5ba9a5ebf4 resolved comments 2022-04-10 11:46:00 +02:00
Fincent7
6bd8972af1 Merge remote-tracking branch 'up/cleanup' into cleanup 2022-04-10 11:41:27 +02:00
Jared Lemke
52b5eb52a0 Remove duplicates
This commit removes 54 entries that are exact duplicates of another entry in the atlas.
2022-04-10 03:32:33 -04:00
AnonymousRandomPerson
2e8447d971 Cleaned up Germany entries 2022-04-10 02:24:31 -04:00
AnonymousRandomPerson
efd6b6a290 Updated upper Germany entries 2022-04-10 02:24:28 -04:00
AnonymousRandomPerson
3fef6abc96 Updated osu!mania 2022-04-10 02:23:49 -04:00
reverb5264
ba55ae2aea Readded Touhou character 2022-04-09 22:53:29 -07:00
reverb5264
16b9373f2b Conflicts fixed(?) 2022-04-09 22:33:47 -07: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
AnonymousRandomPerson
fc13963f70 Updated Reddit additions 2022-04-09 20:37:40 -04: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
Naegles
a08f472666 Edit Request: Adding extra flavour/some history to the entry for Higurashi 2022-04-10 02:23:10 +02: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
g-otn
8fd1830473 fix: entry twm4ix center coordinates 2022-04-09 19:23:47 -03: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
g-otn
4aa953e11a fix: Miku & Reimu friendship entry 2022-04-09 17:49:55 -03: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
Fincent7
bbeda67fad removed a duplicate entry 2022-04-09 15:21:43 +02:00
Fincent7
5db9ba6825 removed duplicate entry 2022-04-09 15:20:46 +02:00
Fincent7
f73dadcc62 removed duplicate entry 2022-04-09 15:16:52 +02: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
Fincent7
96e23314d5 removed duplicate entries 2022-04-09 15:12:14 +02:00
Fincent7
7ab2c605f2 removed duplicate entry 2022-04-09 15:09:21 +02: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
Fincent7
2057c549ea removed duplicate entry 2022-04-09 15:07:13 +02:00
Fincent7
e5f22a6065 removed duplicate entry 2022-04-09 15:03:42 +02:00
Fincent7
1936ce9dda removed duplicate entries 2022-04-09 15:03:02 +02:00
Cal3y
594011e7e4
Updated description/path of id:txi2a3 2022-04-09 15:01:29 +02:00
Fincent7
a92149231c merged duplicate entries 2022-04-09 15:00:55 +02:00
Fincent7
f279e322e7 removed a duplicate entry 2022-04-09 14:55:48 +02:00
Fincent7
f514b0544b removed a duplicate entry 2022-04-09 14:54:22 +02:00
Fincent7
e7bd077742 removed duplicate entry 2022-04-09 14:51:39 +02:00
Fincent7
4b1ebfdb54 removed duplicate entry 2022-04-09 14:50:22 +02:00
Fincent7
e5fcd0cd8a removed duplicate entry 2022-04-09 14:48:33 +02:00