MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2024-12-28 15:04:40 +01:00
Code Issues Projects Releases Wiki Activity
1312 commits 3 branches 0 tags 1.7 GiB
Commit graph

1312 commits

This branch
This branch
All branches
Author SHA1 Message Date
ash
165dc1f143
Merge branch 'master' into cleanup 2022-04-06 21:52:35 +01:00
ash
b29280cf42
cleanup 2022-04-06 21:51:52 +01:00
ash
7d1a59885d
atla cleanup 2022-04-06 21:51:16 +01:00
ash
85b90ee84b
pill cleanup 2022-04-06 21:50:10 +01:00
ash
69bdf4fc3a
france cleanup 2022-04-06 21:49:02 +01:00
ash
59699cc23a
whole lotta red cleanup 2022-04-06 21:48:21 +01:00
ash
bfd1937023
son of man cleanup 2022-04-06 21:47:15 +01:00
ash
ab71cb7e2e
tayto cleanup 2022-04-06 21:46:44 +01:00
ash
c3fee05ef4
india cleanup 2022-04-06 21:45:16 +01:00
ash
96307710a5
onepiece cleanup 2022-04-06 21:44:34 +01:00
ash
3babfe161d
ace cleanup 2022-04-06 21:43:27 +01:00
ash
53dd9e0987
osu cleanup 2022-04-06 21:42:18 +01:00
ash
7bde65415d
Merge pull request #847 from placeAtlas/cleanup 
Cleanup
 2022-04-06 21:40:47 +01:00
ash
004a123ae2
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-06 21:39:38 +01:00
ash
17171540bc
dsmp cleanup 2022-04-06 21:38:51 +01:00
Cheng Hann Gan
b3a841fa36
Merge pull request #843 from AnonymousRandomPerson/cleanup-turtle 
Updated turtle
 2022-04-06 16:36:04 -04:00
ash
2a463f424a
Merge pull request #844 from placeAtlas/master 
Merge pull request #833 from placeAtlas/cleanup
 2022-04-06 21:34:38 +01:00
Cheng Hann Gan
65df17e845 Updated turtle 2022-04-06 16:33:34 -04:00
Stefano
68ea04ed0d
Merge pull request #833 from placeAtlas/cleanup 
Cleanup
 2022-04-06 13:29:29 -07:00
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