Commit graph

1036 commits

Author SHA1 Message Date
mxdanger 329797ea3a Update atlas.json 2022-04-06 15:05:31 -07:00
Nicolas Abram 7c3f4ac3f2
Merge pull request #859 from Chtlotl/cleanup 2022-04-06 18:17:41 -03:00
Chtlotl 70e45dbf7b
Resized Ichigo and added credits
Resized ichigo, added credits, fixed typo
Added credits to luffy, naruto, izuku, haikyuu volleyball, and gon sprites
Added credits to HxH banner and fixed typo
2022-04-06 16:13:00 -05:00
asivery 569ce1c22b Remove tx2feq 2022-04-06 23:05:05 +02:00
ash e12171ddb6
Merge pull request #850 from howardt12345/taiwan-duplicates-cleanup
Cleanup: Duplicates of Taiwan entries
2022-04-06 21:56:18 +01:00
ash 461520108a
Merge pull request #849 from Chat-mots/master
updated web/atlas.json with updated descpription
2022-04-06 21:56:02 +01:00
Howard Tseng 96661d61db
Merge branch 'cleanup' into taiwan-duplicates-cleanup 2022-04-06 16:54:24 -04:00
ash 800381e75c
Merge pull request #846 from CommonCo/cleanup
Fire Emblem title and description fixes
2022-04-06 21:53:07 +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
CommonCo 0d0101084e
readded entry that was removed for some reason. 2022-04-06 16:51:00 -04:00
ash 85b90ee84b
pill cleanup 2022-04-06 21:50:10 +01:00
howardt12345 1dce267e97 Cleanup: Duplicates of Taiwan entries
- Cleaned up duplicates of entries for Taiwan on both the original and independence flags
- Unified the description for the independence flag under 000231
2022-04-06 16:49:43 -04: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
Victor c9507bef3b updated web/atlas.json 2022-04-06 22:41:28 +02: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
CommonCo d4d7ae289d
Fire emblem Title and description fixes/updates 2022-04-06 16:38:41 -04:00
CommonCo dd4bd8f621
Add files via upload 2022-04-06 16:36:58 -04:00
Cheng Hann Gan 65df17e845 Updated turtle 2022-04-06 16:33:34 -04:00
CommonCo 76f89838e0
Fire Emblem title and description fixes 2022-04-06 16:32:27 -04:00
CommonCo d1e1dca406
Fire Emblem Title and description updates 2022-04-06 16:29:07 -04: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
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
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