Commit graph

1293 commits

Author SHA1 Message Date
Nicolas Abram
6fad7803ff
Merge pull request #842 from nico-abram/confl 2022-04-06 17:27:57 -03:00
unknown
76bd23948c Merge remote-tracking branch 'up/master' into confl 2022-04-06 17:26:22 -03:00
Cheng Hann Gan
707785f07e
Merge pull request #839 from ramblingadam/updatefuturama
update r/futurama description and allied community subreddit links
2022-04-06 16:23:46 -04:00
Cheng Hann Gan
d2274d6159
Merge pull request #840 from AnonymousRandomPerson/cleanup-snowdrop
Updated Snowdrop
2022-04-06 16:23:14 -04:00
Cheng Hann Gan
d39db6641c Updated Snowdrop 2022-04-06 16:22:35 -04:00
Adam
f3110103e4 update r/futurama description and allied community subreddit links 2022-04-06 15:18:37 -05:00
Cheng Hann Gan
3abce910d9
Merge pull request #836 from val9k/cleanup
change the region of ISAE SUPAERO/ENSMA drawing
2022-04-06 16:18:04 -04:00
Cheng Hann Gan
9035bad8d0
Merge pull request #837 from AnonymousRandomPerson/cleanup-miku
Removed Miku dupes
2022-04-06 16:17:30 -04:00
zerustu
13865af6ac
Merge branch 'cleanup' into cleanup 2022-04-06 22:16:15 +02:00
Cheng Hann Gan
72ae644fed Removed Miku dupes 2022-04-06 16:14:33 -04:00
zerustu
3d5a90f251
change the region 2022-04-06 22:12:32 +02:00
zerustu
d417abf5db
Delete atlas.json 2022-04-06 22:11:02 +02:00
Cheng Hann Gan
9d5b1effbc
Merge pull request #834 from AnonymousRandomPerson/cleanup-nct
Removed NCT dupe
2022-04-06 16:04:49 -04:00
Cheng Hann Gan
b2e0bc314f Removed NCT dupe 2022-04-06 16:04:03 -04:00
zerustu
0e9b52a807 2022-04-06 22:02:33 +02:00
Nicolas Abram
dff101469b
Merge pull request #827 from velkog/cleanup 2022-04-06 16:57:36 -03:00
Nicolas Abram
2e5b8d3139
Merge pull request #825 from qq410219243/cleanup 2022-04-06 16:56:17 -03:00
Nicolas Abram
ef76739490
Merge pull request #830 from 7automaton/cleanup 2022-04-06 16:54:39 -03:00
Cheng Hann Gan
8529e38b97
Merge pull request #832 from AnonymousRandomPerson/upstream/cleanup-israel
Removed destroyed Israel entry
2022-04-06 15:54:29 -04:00
Cheng Hann Gan
7588472976 Removed destroyed Israel entry 2022-04-06 15:53:23 -04:00
Cheng Hann Gan
7a7eb72b9b
Merge pull request #826 from Bloemist/cleanup
added attribution to my entry
2022-04-06 15:50:21 -04:00
Technic Duck
a4b50c6651
+ Official Vaporeon Beach description (attempt 2)
Removed all unofficial descriptions for Vaporeon Beach, and modified the main one.
This newer edit was made by the official team behind the Vaporeon Beach art.

Edits these various descriptions with an official one:
<img src="https://user-images.githubusercontent.com/56928485/162042418-e957154b-92b5-4fbb-a761-c009d74efe2d.png" width=50% height=50%>

Attempt 2 at trying to PR into `cleanup`.
2022-04-06 14:49:03 -05:00
Velkog
f816a4b4d6 Updating entry ID tx7q3r with correct informataion 2022-04-06 12:43:53 -07:00
Bloemist
f88209e1a9 Update atlas.json
added attribution to my entry
2022-04-06 21:41:14 +02:00
chocomint1
0419474c1d
Revision - PortalHub (txl9ri)
Revised and extended description, added link to website
2022-04-06 15:40:05 -04:00
ash
f6fe47253b
Merge pull request #816 from placeAtlas/reddit
New moderated reddit submissions
2022-04-06 20:28:48 +01:00
ash
ba3204a9ae
Merge branch 'master' into reddit 2022-04-06 20:28:20 +01:00
ash
905a2755d3
Merge pull request #815 from operationUrus/cleanup
Resubmitting Rewrites to Destroy the Godmodder 2 Logo
2022-04-06 20:25:55 +01:00
ash
5fc7388658
Merge pull request #813 from Fincent7/cleanup
Removed a couple of duplicate entries
2022-04-06 20:10:12 +01:00
Fincent
491b419ae6
Merge branch 'cleanup' into cleanup 2022-04-06 21:09:52 +02:00
Nicolas Abram
5464108f0d
Merge pull request #814 from nico-abram/upd_redd 2022-04-06 16:09:47 -03:00
ash
51277f7a9c
Merge pull request #810 from JopStro/cleanup
Fix typo
2022-04-06 20:09:21 +01:00
ash
44c32ae016
Merge pull request #809 from qq410219243/cleanup
Revisions - Tetris (twwiwr, twtcn7)
2022-04-06 20:08:29 +01:00
unknown
cded0661e5 New moderated reddit submissions 2022-04-06 16:07:49 -03:00
operationUrus
9e92cc9409
Add files via upload 2022-04-06 14:06:37 -05:00
Fincent
d5bf32e905
Merge branch 'cleanup' into cleanup 2022-04-06 21:04:11 +02:00
ash
ef671ba4ae
Merge pull request #802 from rclabough/tsplaceedits
Editing descriptions and websites for TS entries
2022-04-06 20:02:49 +01:00
ash
96ab5e323b
Merge pull request #812 from placeAtlas/netlify
netlify.com sponsorship
2022-04-06 20:00:34 +01:00
Fincent7
aaf42b70da Removed a couple of duplicate entries 2022-04-06 20:58:43 +02:00
ash
f6ca7d3e2c
netlify.com sponsorship 2022-04-06 19:58:12 +01:00
ash
2597cf6d79
Merge pull request #801 from memmam/cleanup
MrRobot alliance part 3 description update, Vernba outline clarification, added Zamenhof to Esperanto
2022-04-06 19:54:11 +01:00
ash
b246659a49
Merge pull request #799 from howardt12345/cleanup
Edit: Restored entry 000231 and updated coordinates
2022-04-06 19:53:03 +01:00
ash
8a47274820
Merge pull request #797 from TrevorSayre/edit-jelle
Edit jelle twvzfs
2022-04-06 19:52:50 +01:00
ash
73e5e3d39f
Merge pull request #791 from AnonymousRandomPerson/cleanup-anonymousrandperson
Fixed links I messed up in add requests
2022-04-06 19:51:48 +01:00
ash
4b202fd564
Merge pull request #790 from AnonymousRandomPerson/cleanup-nordicunion
Cleaned up Nordic Union entries
2022-04-06 19:51:36 +01:00
ash
a6c558e818
Merge pull request #788 from CKlinck/cleanup
Updated Title & Description
2022-04-06 19:51:05 +01:00
chocomint1
07bed9743a
Revisions - twtcn7
Revised description + fixed capitalization and spelling
2022-04-06 14:38:54 -04:00
JopStro
12afacdf28 Fix typo discrepency 2022-04-06 19:34:36 +01:00
chocomint1
7ea50c5f94
Revisions - twwiwr
Grammar and cap fixes, fleshed out desc, removed incorrect affiliation link
2022-04-06 14:33:47 -04:00
Ellie M
f5d61e9020 Added Zamenhof to Esperanto
smelv384 attempted to add this last night, but accidentally committed it to master instead of cleanup in their repo. Fixed!
2022-04-06 11:33:02 -07:00