Commit graph

1887 commits

Author SHA1 Message Date
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
Hans5958 2dadfdb255
Port 63ed091
I forgor
2022-04-09 22:49:27 +07: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
Fincent7 f05cbc35be updated a description per request 2022-04-09 14:29:55 +02:00
Fincent7 14ea44f1dc removed duplicate entries 2022-04-09 14:26:15 +02:00
Hans5958 5306f83673 Change position and size of coords, move show list button below overlay
Put it on top left so it is not awkward
2022-04-09 17:55:34 +07:00
Hans5958 4bbc7fdaea Manual edits 2022-04-09 17:28:12 +07:00
Hans5958 4ce2afb60b Console logs haven't been removed?! 2022-04-09 17:24:30 +07:00
Hans5958 bdb1ccccd5 Run formatter 2022-04-09 16:34:03 +07:00
Hans5958 a870d33cf8 Refactor to avoid code duplicates 2022-04-09 16:33:10 +07:00
Hans5958 331e7bdb5a Use arguments on one log
You can use arguments on console log and you can access the error like normal
2022-04-09 16:33:10 +07:00
Hans5958 f6b89ac7c1 Remove redundant here and link "our Discord server" instead 2022-04-09 16:33:10 +07:00
Hans5958 7b2e9af945 Improve Donation window 2022-04-09 16:33:10 +07:00
Hans5958 bf3c5c1255 Fix z-index again 2022-04-09 16:33:10 +07:00
Hans5958 0dad9761dc Use commas instead of x for coords
Since the coords shown on top left is in comma
2022-04-09 16:33:10 +07:00
Hans5958 98e60fc14b Avoid creating duplicates on diff mode
So we don't have more than 2x as much of entries on this mode
2022-04-09 16:33:10 +07:00
Hans5958 babb9fdd5a Correct z-index so no lines above entries background 2022-04-09 16:33:10 +07:00
Hans5958 d7861baff3 Finally make explore mode work, small refactor
Oh man, these element structures were quite inefficient...
2022-04-09 16:33:10 +07:00
Hans5958 eab2da0e22 Fix wonky authors 2022-04-09 16:33:10 +07:00
Hans5958 ae4ca99262 Redirect error reports to Discord 2022-04-09 16:33:10 +07:00
Hans5958 c5661e6cbc Update About page, change z-index of some elements
Add links to Ko-Fi and Patreon, change link to 2017 Place, typo changes, align back buton
2022-04-09 16:33:10 +07:00
Hans5958 7ecf35964d Remove versions from script and CSS tags
Seems unnecessary in Netlify. Revert if needed.
2022-04-09 16:33:10 +07:00
Hans5958 804159e116 Reduce copyright notice, add 2022 contributors, add missing notice
The lengthy boilerplate is unnecessary, especially since it is already linked. The type of license can stay there instead.
2022-04-09 16:33:10 +07:00
Hans5958 a19ee7d65a Use HTTPS link to license 2022-04-09 16:33:09 +07:00
Hans5958 b20ebed52d Fix prod domain 2022-04-09 16:33:09 +07:00
Hans5958 8572d5799e Wrong CSS selector
Why I do always got last-minute bugs, for christ sake?
2022-04-09 16:33:09 +07:00
Hans5958 eb0168d736 Use pointer 2022-04-09 16:33:09 +07:00
Hans5958 7c1fcf06e3 Hide diff on prod domain 2022-04-09 16:33:09 +07:00
Hans5958 2723f9ed17 Convert it into dropdown 2022-04-09 16:33:09 +07:00
Hans5958 dec32c648f Capitalization fix 2022-04-09 16:33:09 +07:00
Hans5958 9c4aea3c3b Use button class instead of referring IDs 2022-04-09 16:33:09 +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
Stefano 14b61b7287
Merge branch 'master' into reddit 2022-04-09 09:42:50 +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
Cheng Hann Gan 5d2c7d1bb3
Merge pull request #1136 from AnonymousRandomPerson/cleanup
Cleanup
2022-04-09 02:29:53 -04:00
Cheng Hann Gan 28b53375b7
Merge pull request #1133 from carlyc99/fixups
Update twlcx8 coords 2
2022-04-09 02:26:52 -04:00
AnonymousRandomPerson d99d4ae4f4 Updated Brazil entries 2022-04-09 02:25:05 -04:00
GeoDash897 2d629f2efd Fix typo on Goku Spirit Bomb entry 2022-04-09 01:45:34 -04:00
GeoDash897 89918458ad Update Unturned Entries
I updated each of these entries based on GreatHeroJ's thread on the
r/placeAtlas2 discord.

Note that I put GreatHeroJ's name as the submitter as they were
the one that had given me these recommendations in the first place.
As a result, their name might have to be changed later on in order
match their Reddit name.
2022-04-09 01:43:21 -04:00
AnonymousRandomPerson f2a5361172 Updated bound baby 2022-04-09 01:09:31 -04:00
AnonymousRandomPerson cc08cf2044 Updated jan pi Toki Pona 2022-04-09 00:59:19 -04:00
lchi123 97a044f165
Add files via upload 2022-04-08 21:34:27 -07:00
Cheng Hann Gan 9d39d91c25
Merge pull request #1134 from AnonymousRandomPerson/cleanup
Cleanup
2022-04-09 00:04:27 -04:00
AnonymousRandomPerson 36ea2a2dbe Cleaned up Spain entries
-Removed politically charged France entries.
2022-04-08 23:59:07 -04:00
carlyc99 5404290dcf Update twlcx8 coords 2 2022-04-08 20:36:43 -07:00
AnonymousRandomPerson 957e6a0064 Updated MAP flag link 2022-04-08 23:05:21 -04:00
AnonymousRandomPerson 8119cd702c Updated SCP 2022-04-08 23:02:46 -04:00
Cheng Hann Gan 89e9dd8caf
Merge pull request #1127 from Wayland-Smithy/Mr-mega-israel-robot
Fix borders, remove dupe
2022-04-08 22:53:30 -04:00
GeoDash897 37de04a61c Removed Dupe Eren entry- Novazert's Disc thread
I removed this entry based on the recommendations given by
Novazert on the Discord server- there a better entry for
the same art and entry caused messy highlighting
2022-04-08 22:52:17 -04:00
Wayland-Smithy ad5ff2f87c Update description 2022-04-08 19:49:01 -07:00
GeoDash897 8b8d275329 Update INSA entry based on Discord Thread
I updated the description and the boundary of the entry itself
based on recommendations given by D's thread on the
r/placeAtlas 2 discord server.
2022-04-08 22:48:26 -04:00
AnonymousRandomPerson 63ed0915d2 Supported searching exact ID match 2022-04-08 22:38:19 -04:00
AnonymousRandomPerson 6d6bfb17a4 Updated Reddit additions 2022-04-08 22:30:56 -04:00
AnonymousRandomPerson 7c0e9db4f0 Updated Reddit additions 2022-04-08 22:29:57 -04:00
GeoDash897 9534ef4eb9 Update description of Emotiguy (Picardia)
I updated the description and website of this entry to match
the changes proposed by ali,kirb's thread in the r/placeAtlas2 discord
server.
2022-04-08 22:27:50 -04:00
Chtlotl 2a57bdc6cb
Updated descriptions and added credits.
Updated descriptions for Hinagarasu, Naruto Uzumaki, Dragon Ball, and Gon Freecss sprites upon request from their respective communities.
Removed redundant hunter x hunter banner entry as per the wishes of the Hunter x Hunter place community
Resized mislabelled DIO entry at the request of the Naruto place community.
2022-04-08 21:27:42 -05:00
GeoDash897 dc39332f46 Fix PearlescentMoon entry based on SybreFoxes thread 2022-04-08 22:20:34 -04:00
AnonymousRandomPerson e70ff3c202 Merge branch 'master' into cleanup 2022-04-08 22:07:26 -04:00
Cheng Hann Gan 6ef2c96176
Merge pull request #1122 from Johnyknowhow/cleanup
Ukraine flag cleanup on 11 items
2022-04-08 21:57:58 -04:00
Cheng Hann Gan fddd2931f5
Merge pull request #1121 from SpiderInMyEar/cleanup
Removed duplicate* Legends of Idleon submission
2022-04-08 21:57:03 -04:00
Wayland-Smithy c012df1fb3 Fix borders, remove dupe 2022-04-08 18:47:31 -07:00
AnonymousRandomPerson d9dfa707be Cleaned up Central Alliance entries 2022-04-08 21:47:13 -04:00
Johnyknowhow e72e8f0623
Merge branch 'placeAtlas:cleanup' into cleanup 2022-04-08 16:27:47 -07:00
Johnyknowhow f7a26212f0 Removal of dupes
forgot to remove in original commit
2022-04-08 16:10:42 -07:00
Johnyknowhow 993c057036 Ukraine flag cleanup
slava ukraini
(-)txjdp4 - dupe, worse desc
(e)txm9cv - cleaned up outline, has better desc

mriya
(-)twrgcj - dupe, shorter desc
(e)twrhho - used title from twrgcj, cleaned up outline

aot wings
(e)twssnx - cleaned up outline

saint sophia cathedral
(-)tx8w9b - dupe, concise desc but lacking info
txd4fi - remaining entry

kyiv saint michael monestary
(-)tx7sfo - dupe, wrong desc, saint sophia is the artwork to the right
(e)tx8xgq - edited to correct title/description of correct building

right side tank farmers
(-)txayoh - dupe
(e)txcfph - edited wording for clarity, updated outline

left side tank farmers
(-)tx279g - shorter desc
(e)tx2vo3 - remaining, combined web link/subreddit

glory to heroes
(e)tx93hm - outline, spelling

ukraine flag
(-)000170 - dupe, shorter desc
(e)tx86fp - outline, updated desc

dota 2 juggernaut
(e)000292 - edited outline, updated desc for explanation

zelensky
(-)txpr8y - referencing glasses edit not visible on the final canvas
(e)twptss - outline
2022-04-08 16:07:54 -07:00
SpiderInMyEar 43b9d94345
Removed Legends of Idleon submission
No edits.
2022-04-09 00:29:46 +02:00
Stefano 0659cb8be2
Update manifest.webmanifest 2022-04-09 00:21:31 +02:00
Stefano 53e1a88095
Merge pull request #1119 from mxdanger/cleanup
Duplicate removals and lots of path cleanup
2022-04-09 00:14:00 +02:00
mxdanger c3e41b3903 France, Elden Ring, Silksong cleanup
Removed: France duplicates
Removed: Elden Ring duplicates
Removed: Inscryption duplicates
Removed: Serbia duplicate
Added: missing subreddits
Updated: Cleaned up paths
2022-04-08 14:59:31 -07:00
Stefano b21d94f1d4
Merge branch 'master' into diffdel 2022-04-08 23:43:38 +02:00
Stefano 13ef84f86a
Update index.html 2022-04-08 23:42:47 +02:00
Stefano bb5db95158
Merge branch 'master' into diffdel 2022-04-08 23:37:02 +02:00
Stefano 9613e32e48
Merge pull request #1112 from memmam/cleanup
Fixed Freak Squad / FIRST Robotics border, deduplicated Freak Squad
2022-04-08 23:35:17 +02:00
Stefano a6180beb78
Merge pull request #1109 from nomadsgalaxy/cleanup
Ukraine Mural Update
2022-04-08 23:35:05 +02:00
Stefano d47d95e93b
Merge branch 'master' into feature/passive_scroll 2022-04-08 23:34:13 +02:00
mxdanger dfd77e0f99 Canada duplicate removal and path cleanup
Removed: Flag of Nunavut duplicate
Removed: Flag of Alberta duplicate
Removed: Flags of the Canadian provinces duplicate
Removed: Canada flag duplicates
Cleaned up paths
2022-04-08 14:11:28 -07:00
mxdanger c06ef641f8 Duplicate removal and path cleanup
Remove: The Son of Man duplicate
Remove: Colombia duplicate
Update: Factorio description
Cleaned up several paths of other objects
2022-04-08 13:50:48 -07:00
unknown 68f5f8b5e5 Improved diffview 2022-04-08 17:12:39 -03:00
Wayland-Smithy 9be749cf12 Remove test 2022-04-08 11:42:32 -07:00
Anthony Dragone 8b6bf55376 Delete atlas.json.bak 2022-04-08 14:17:51 -04:00
Ellie M 6c90a2417e Fixed Freak Squad / FIRST Robotics border, deduplicated Freak Squad 2022-04-08 10:58:00 -07:00
unknown f5b84f2331 Collapsable coordinate box 2022-04-08 14:39:10 -03:00
Cheng Hann Gan 87092846c1 Updated Central Alliance entries 2022-04-08 13:33:49 -04:00
Anthony Dragone 091fed62a6 Clarification Check
Added clarification to Bayraktar
2022-04-08 13:13:49 -04:00
Anthony Dragone de263ec508 Updated Info
Updated info in regards to the overall Ukraine Flag
2022-04-08 13:11:40 -04:00
Anthony Dragone 8f50023422 Spell Check 2022-04-08 12:58:42 -04:00
unknown be7e1ec28d Coord box 2022-04-08 13:39:41 -03:00
Anthony Dragone 83724d465c Byraktar Update
Updated the Byraktar to represent the twitch raid that forced it onto R/PlaceUkraine's Mural against their permission.
2022-04-08 12:34:00 -04:00
Cheng Hann Gan 4b919c35cc Merge branch 'master' into up/master 2022-04-08 12:33:04 -04:00
Nicolas Abram 598c87af7e
Merge pull request #1103 from fabi321/starscape-cleanup 2022-04-08 12:07:00 -03:00
Nicolas Abram 1c3a90799d
Merge pull request #1102 from linkcool200/cleanup 2022-04-08 12:06:32 -03:00
Nicolas Abram 6ad8a167bf
Merge pull request #1088 from fabi321/mizkif-cleanup 2022-04-08 12:06:14 -03:00
Fabian Wunsch 53459529dc fixed json 2022-04-08 16:47:38 +02:00
Fabian Wunsch bc6f41ea17 Changed description 2022-04-08 16:44:24 +02:00
Fabian Wunsch 3a79cc03fa Cleaned up scarscape
duplicate of 000381 (second pr after first one had merge conflicts)
2022-04-08 16:39:33 +02:00
Stefano Haagman 3176f39b44 Rename 2022-04-08 16:34:21 +02:00
Stefano Haagman 5cb8001fdf Adding PWA Support - Step 1 2022-04-08 16:30:51 +02:00
linkcool200 aed7a8e0e1
Removing duplicate OnlyNekos Entry 2022-04-08 10:27:13 -04:00
unknown 80ed93d1cc Remove entry missing in all images 2022-04-08 11:16:05 -03:00
Stefano Haagman 03c499bca3 lang -> accecibility 2022-04-08 16:14:58 +02:00
Stefano Haagman 2f84c98e60 Lighthouse 2022-04-08 16:13:50 +02:00
Nicolas Abram 3194e61a86
Merge pull request #1090 from NukeOfficial/cleanup 2022-04-08 11:09:33 -03:00
unknown 93139d6748 Merge remote-tracking branch 'up/master' into reddit 2022-04-08 11:06:18 -03:00
Nicolas Abram fe01eb93de
Merge pull request #1084 from fabi321/wind-turbine-cleanup 2022-04-08 11:02:33 -03:00
unknown 24ea1b1038 New submissions 2022-04-08 11:00:44 -03:00
Stefano Haagman 307557882f woops 2022-04-08 15:59:37 +02:00
Stefano Haagman 15624c9db2 test 2022-04-08 15:56:22 +02:00
Nicolas Abram 47a049a409
Merge pull request #1086 from SpiderInMyEar/cleanup 2022-04-08 10:53:08 -03:00
Nicolas Abram 91bff6c5dc
Merge pull request #1087 from fabi321/wheel-of-time-cleanup 2022-04-08 10:53:00 -03:00
unknown 8bbb1f4977 Gitignore atlas-before-ids-migration.json 2022-04-08 10:49:23 -03:00
Nicolas Abram 98d27ab04b
Merge branch 'master' into cleanup 2022-04-08 10:47:54 -03:00
Nicolas Abram 2c80c6ace9
Merge pull request #1093 from hexadecimaul/cleanup 2022-04-08 10:47:41 -03:00
Nicolas Abram 50c14ba2f6
Merge pull request #1094 from biglu91/cleanup 2022-04-08 10:46:24 -03:00
Nicolas Abram 64a7c04ed5
Merge pull request #1095 from qoheniac/cleanup 2022-04-08 10:45:45 -03:00
Nicolas Abram f29d53b0e8
Merge pull request #1099 from Keigun-Spark/cleanup 2022-04-08 10:34:25 -03:00
Nicolas Abram f403646802
Merge pull request #1096 from Fincent7/cleanup 2022-04-08 10:33:54 -03:00
Nicolas Abram e795b8fd56
Merge pull request #1073 from N0ZTRA/Josh-Duggar-duplicate-removal 2022-04-08 10:32:59 -03:00
Nicolas Abram c84c36f6a9
Merge pull request #1076 from N0ZTRA/BFDI-Edits---Several-parts 2022-04-08 10:32:35 -03:00
Stefano eb68c65b53
Update index.html 2022-04-08 15:26:54 +02:00
N0ZTRA 5ea387338e Removed duplicates Bow of II fixed 2022-04-08 09:15:42 -04:00
N0ZTRA 3331883bb2 BFDI edits fixed 2022-04-08 09:11:56 -04:00
Keaton 7404be6f9b Remove duplicates of F Josh Duggar Fix
Commit on up to date cleanup
2022-04-08 08:42:14 -04:00
Fincent7 ab7ffdfcf2 improved NOS path 2022-04-08 14:33:19 +02:00
Fincent7 7bcf91ad22 removed a duplicate entry 2022-04-08 14:27:34 +02:00
Fincent7 731709e7ce removed a duplicate entry 2022-04-08 14:26:37 +02:00
Fincent7 093934bdce fixed a line break 2022-04-08 14:24:52 +02:00
Fincent7 3617c63a15 removed a duplicate entry 2022-04-08 14:23:50 +02:00
Fincent7 55644b498f removed a duplicate entry 2022-04-08 14:22:41 +02:00
Fincent7 c5a1bccb6b removed a duplicate entry 2022-04-08 14:21:25 +02:00
Fincent7 a2779b8d04 removed duplicate entries & fixed line breaks 2022-04-08 14:17:07 +02:00
Julian B 4a71b24ce0
Removed duplicates of pxls.space
Removed duplicates.
Cleaned up description.
Cleaned up border to full art piece.
2022-04-08 14:13:47 +02:00
Fincent7 0aee308262 removed a duplicate entry 2022-04-08 14:11:13 +02:00
Fincent7 8c0ee77db1 removed a duplicate entry 2022-04-08 14:10:23 +02:00
Fincent7 456a0d5ed6 removed a duplicate entry 2022-04-08 14:09:47 +02:00
Julian B 4e7a442fe5
Removed duplicates of pxls.space
Cleaned up description.
Cleaned up border to full art piece.
2022-04-08 14:09:28 +02:00
Fincent7 1eeab1af82 gave 000125 a better path 2022-04-08 14:07:25 +02:00
Fincent7 d15d677b92 noted an artwork as covered due to the new canvas 2022-04-08 14:03:58 +02:00
Fincent7 cbb44a7410 gave twvd2j a better path 2022-04-08 14:03:10 +02:00
Fincent7 b02af55fd6 gave Kel (ty1ncb) a better path 2022-04-08 14:00:35 +02:00
Fincent7 1f5ba490ae removed duplicate entries 2022-04-08 13:43:01 +02:00
qoheniac 078c14af13 Scania is Swedish not Danish 2022-04-08 13:24:58 +02:00
biglu91 ec06b42324
Changed path and description for Juventus Logo 2022-04-08 13:06:17 +02:00
hexadecimaul 3a19847c69
Maryland's Place fixes to submissions on our artwork
Fixed outline, and opted for alternate/subjectively better title and description for ID: twv0lb
Made adjustment to outline, title, and description to better commemorate raven's community and reduce overlap for ID:twtqqg
fixed outline and changed link in website to the university's website for ID:twuydp
Fixed title and added an alternate description for the flag for ID:twqxe8
2022-04-08 05:56:30 -04:00
NukeOfficial f707afc2a6
Cleaning up edges of LowkoTV Badge
2 pixels were misplaced. It now has the borders the Badge is *supposed* to have which will match in the timeline.
2022-04-08 10:16:59 +02:00
Fabian Wunsch 35dc842aab Cleaned up Mizkif 2022-04-08 09:21:01 +02:00
Fabian Wunsch 83d66f6704 Cleaned up Wheel of time
duplicate of twt46s
2022-04-08 09:06:42 +02:00
SpiderInMyEar 8fd816a3ba
Removed duplicate Ludwig's Kirby
No edits.
Resubmitted.
2022-04-08 09:01:14 +02:00
Fabian Wunsch 513c8f04d1 Cleaned up german wind turbine
duplicate od twxbvf
2022-04-08 08:55:33 +02:00
Nicolas Abram bc11b622a6
Merge pull request #1082 from fabi321/german-flag-update 2022-04-08 03:50:50 -03:00
Technic Duck 9c0433b340
EarthBound cleanup
Added new official description; removed duplicate entry
2022-04-08 01:47:31 -05:00
Fabian Wunsch 1f2f15dba9 Update of the size of the second german flag 2022-04-08 08:45:25 +02:00
Wayland-Smithy f8d5722a7a Merge branch 'cleanup' into dedupe-ids
# Conflicts:
#	web/atlas.json
2022-04-07 23:37:45 -07:00
Nicolas Abram 8f799b5c41
Merge pull request #1080 from N0ZTRA/Chara-removal 2022-04-08 03:33:32 -03:00
Nicolas Abram 5738a20ca3
Merge pull request #1079 from fabi321/cleanup 2022-04-08 03:33:15 -03:00
AnonymousRandomPerson 91fdf43988 Updated Central Alliance entries 2022-04-08 02:26:41 -04:00
AnonymousRandomPerson aa2c375a45 Updated Ucursitos 2022-04-08 02:26:40 -04:00
Fabian Wunsch a98e3e71e8
Merge branch 'placeAtlas:cleanup' into cleanup 2022-04-08 08:25:48 +02:00
Keaton 776b2528d6 Remove Chara entry
Requested removal, entry made to be a reference for a prior snapshot on the atlas. Requested by the user who created the entry. ID tyrtuy

Thread link:
2022-04-08 02:19:17 -04:00
Wayland-Smithy 9430582c50 Dedupe ids 2022-04-07 23:18:17 -07:00
Fabian Wunsch ffe68e482e Removed duplicate entry
Duplicate of tx9gjn
2022-04-08 08:14:21 +02:00
Nicolas Abram ce9e74af4b
Merge pull request #1078 from N0ZTRA/Dark-Side-of-The-Moon 2022-04-08 03:13:11 -03:00
Keaton fdb47723fe Dark Side of The Moon duplicate removal, description change
As requested in atlas-edits a duplicate entry for the Dark Side of The Moon is removed and the remaining entry has its description updated.

I left ID twmfj6 due to its much better outline. It gets a new description and more reddit links. ID twm166 is removed.

Atlas-edit link:
2022-04-08 02:11:30 -04:00
Nicolas Abram b68e8189cc
Merge branch 'master' into double_textbox 2022-04-08 03:09:59 -03:00
Nicolas Abram a1ecd39963
Merge branch 'master' into cleanup 2022-04-08 03:09:01 -03:00
Nicolas Abram 7454571151
Merge branch 'master' into diff 2022-04-08 03:06:47 -03:00
Nicolas Abram bb379fb77a
Merge pull request #1064 from N0ZTRA/TU-Darmstadt 2022-04-08 02:31:42 -03:00
Nicolas Abram d1bb8dcf7f
Merge pull request #1065 from N0ZTRA/Tango-Tek-Description 2022-04-08 02:31:07 -03:00
Nicolas Abram e156fccc8e
Merge pull request #1063 from N0ZTRA/Friday-Night-Funkin 2022-04-08 02:30:25 -03:00
Nicolas Abram e1daed4974
Merge pull request #1067 from N0ZTRA/Portal-Dachshund 2022-04-08 02:29:15 -03:00
Nicolas Abram 32984e5618
Merge pull request #1071 from N0ZTRA/The-OA-remove-and-clean 2022-04-08 02:28:59 -03:00
Nicolas Abram 713aa2ec8f
Merge pull request #1069 from N0ZTRA/Shark-Park 2022-04-08 02:27:17 -03:00
Hans5958 a8632ca4ab I forgot to tell you to wait! 2022-04-08 12:16:15 +07:00
unknown ea39434d61 Readd recommendation msg 2022-04-08 02:13:35 -03:00
Keaton 28639ee5fa Remove old OA entry, fix new one
As requested in Discord, the old entry for The OA is removed (ID tx5p1f) and the new one has the 'n' removed (ID tx4op2)

Discord link:
2022-04-08 01:00:01 -04:00
Hans5958 ef0f1fd935 Last major full format ever (hopefully!)
as in, new entries will be formatted automatically, but full format may be needed when there is a change on the formatter itself
2022-04-08 11:55:45 +07:00
unknown 9bc14f4453 Make time.js urls relative 2022-04-08 01:47:59 -03:00
Keaton 7ee7110284 Removed incorrect attributions for shark park shark
As denoted in an atlas conflict two entries denote that a shark found on the canvas is an Ikea soft toy. They link to the toy's reddit.

Based on reddit planning posts the shark was indeed created by r/shark_park. Possibly with some input by r/Blahaj (doesn't seem to be any note of this).

Removed the two Blahaj entries: ID 000406 & two1vu. Capitalized the shark park entry ID tws2an

See Reddit planning post:
Discord atlas edit:
2022-04-08 00:35:36 -04:00
Wayland-Smithy b0b1215d7f Add diff modes 2022-04-07 21:06:16 -07:00
Keaton c121d2e2e5 Portal Dachshund reddit change
As suggested this artwork was a joint effort between r/Dachshund and r/placeDE. The reddit link for this entry (ID twqngc) is changed to r/Dachshund.

Discord link:
2022-04-08 00:05:39 -04:00
Keaton 332dff5891 Added Description for Tango Tek Entry
Added suggested description for entry ID twv2re.

Suggestion from https://discord.com/channels/960791635342524496/960847771106152488/961771183127277648
2022-04-07 23:49:04 -04:00
Keaton 65f7bce0a6 Removed duplicate for TU Darmstadt, merge two entries
Essentially merges entries tx45sf & twwdz5. tx45sf is the remaining entry with both sets of information.

The duplicate entry ID twvb5t is removed.
2022-04-07 23:41:55 -04:00
Keaton 025fd54d7a Removed Friday Night Funkin duplicates
Two duplicate entries are removed and relevant details merged into remaining entry ID twsjha.
Added information about the boyfriend being the hero and included the link to the game.

Entries removed are ID twpq6t & twrh3g
2022-04-07 23:22:21 -04:00
AnonymousRandomPerson 433764b03c Updated Ensemble MapleStory Guild 2022-04-07 23:15:42 -04:00
AnonymousRandomPerson 6d1a8cad48 Updated Project Arrhythmia 2022-04-07 23:12:24 -04:00
AnonymousRandomPerson 5e64df30e1 Updated 5h3i1ah the cat 2022-04-07 22:46:30 -04:00
unknown 1f30614cbe Merge remote-tracking branch 'up/cleanup' into help_jon 2022-04-07 23:36:17 -03:00
AnonymousRandomPerson b2fc7796d2 Fixed AEsir link 2022-04-07 22:33:05 -04:00
unknown 19bc9c99f8 Merge remote-tracking branch 'up/master' into cleanup 2022-04-07 23:17:02 -03:00
AnonymousRandomPerson c0d056abe4 Updated Aseprite 2022-04-07 22:13:52 -04:00
Johnyknowhow 836e476f11 Formatting 2022-04-07 19:12:48 -07:00
Cheng Hann Gan 80c3b9818b
Merge pull request #1060 from SeanTheBuilder1/cleanup
removed non-center emcompassing entry of Stellaris Gigastructures Kaiser
2022-04-07 22:08:50 -04:00
Johnyknowhow ea759b9634 Fixed small chilean flag border
updated border area
2022-04-07 19:06:14 -07:00
Cheng Hann Gan 81aa2e2caf
Merge pull request #1057 from place-throwaway/cleanup
Fix Moist Esports
2022-04-07 22:06:08 -04:00
Nicolas Abram 14e41ead2a
Merge branch 'master' into double_textbox 2022-04-07 23:04:59 -03:00
Nicolas Abram 23beb3a2c7
Merge branch 'master' into reddit 2022-04-07 23:04:46 -03:00
Johnyknowhow 84c10997d5 Various duplicate removals and description edits
Removed duplicates from various artworks south of the northwest Turkish flag, edited a few descriptions to combine information/increase clarity/make it more understandable to outsiders

RIT logo
(-)twua6s - duplicate, short desc
(e)twu980 - remaining, merged into, combined descriptions

small chilean flag:
(-)txdqoq - duplicate, no desc
(-)txd2js - duplicate, outdated desc
(-)tx8o7v - duplicate, joke desc
(-)txa6ya - duplicate, troll desc
txffm2 - remaining entry

belgian flag Tintin
(e)000056 refined shape, updated title and description

canadian flag
(-)txapxq - dupe, simple entry
(-)twx0nb - dupe, doesn't mention canada, only the battle for it
(-)twp9xq - dupe, good description but twmbw6 seems better (my opinion)
(e)twmbw6 - remaining entry; good description, changed subreddit to /r/placecanada

eldenring potfriend
(-)twrfvo - dupe, good description but lacking context
(e)txysr4 - remaining entry; merged description in and added objective explanation of *what* potfriend is, edited for brevity

large chile flag/art area
(-)txaka4 - dupe, super short desc
(-)txbdl6 - dupe, not descriptive about the art
twn3qv - remaining entry, perfect description
2022-04-07 18:58:40 -07:00
Sean Patrick 171140464a removed non-center emcompassing entry of Stellaris Gigastructures Kaiser 2022-04-08 09:58:32 +08:00
unknown 8da6913b42 Remove duplicated text 2022-04-07 22:55:10 -03:00
AnonymousRandomPerson eabfb4263c Allowed searching by subreddit 2022-04-07 21:53:33 -04:00
unknown 82cfd67c63 New reddit submissions, remove some dupes 2022-04-07 22:40:33 -03:00
place-throwaway 9e260ba599 Fix Genshin Impact
Changed Chinese bracket to English bracket
2022-04-08 09:38:21 +08:00
AnonymousRandomPerson ddca22fcab Updated Angry Birds and Ice Barrage 2022-04-07 21:36:48 -04:00
AnonymousRandomPerson e70ed91692 Updated erobb221 2022-04-07 21:32:44 -04:00
place-throwaway ef5a4dfbc2
Merge branch 'cleanup' into cleanup 2022-04-08 09:30:04 +08:00
place-throwaway 4e1e838726 Fix Moist Esports 2022-04-08 09:27:15 +08:00
Nicolas Abram 4e78ed3dbd
Merge pull request #1055 from RokonShimo/cleanup 2022-04-07 22:26:23 -03:00
place-throwaway 07a5851490 Update Genshin Impact 2022-04-08 09:20:31 +08:00
Frostplays017 272961e348 Updated entries for Hermitcraft/MCC Players 2022-04-08 11:07:04 +10:00
Nicolas Abram b8bbe09f57
Merge pull request #1054 from GeoDash897/cleanup 2022-04-07 21:21:39 -03:00
Nicolas Abram d9dbfde4b0
Merge pull request #1051 from ThePizzaMuncher/cleanup 2022-04-07 21:21:10 -03:00
GeoDash897 23ad91149e Fix spelling error in BTS Logo entry 2022-04-07 19:42:21 -04:00
unknown 7ca4b8fb48 Fix duplicated textbox 2022-04-07 20:32:10 -03:00
Alex Tsernoh 948c0d446c
Merge branch 'master' into time-travel-2 2022-04-08 00:14:04 +01:00
Alex Tsernoh 880399eb8c
disable atlas on not latest image 2022-04-08 00:11:29 +01:00
ThePizzaMuncher 72b548a210 yes 2022-04-08 00:31:29 +02:00
Alex Tsernoh 77887164ee
add final image to timeline 2022-04-07 23:06:24 +01:00
ash b49f94d804
Merge branch 'master' into reddit 2022-04-07 22:46:49 +01:00
Alex Tsernoh 57ac93c817
Merge branch 'master' into time-travel 2022-04-07 22:35:27 +01:00
ash 0fb17c5d35
Merge branch 'master' into nowarning 2022-04-07 22:30:50 +01:00
unknown db86c77019 Remove double quote warning 2022-04-07 18:18:36 -03:00
Wayland-Smithy 5cc49d2fc8 Change hover display to list small areas first 2022-04-07 14:09:41 -07:00
Nicolas Abram 24b551f6ae
Merge pull request #1045 from SpiderInMyEar/cleanup 2022-04-07 18:08:43 -03:00
Nicolas Abram 508ac85031
Merge pull request #1042 from Falki-git/cleanup 2022-04-07 18:08:18 -03:00
SpiderInMyEar 2d99f8b3fa
Fixes to Omori title screen area
Removed duplicate main entry; other submission makes it redundant.
Redrew Omocat submission's outline.
2022-04-07 22:58:18 +02:00