Commit graph

513 commits

Author SHA1 Message Date
Stefano Haagman
2d840fc36b Merge branch 'cleanup' 2022-04-06 00:33:13 +02:00
ash
3c3860fdff
Merge pull request #550 from ThePizzaMuncher/cleanup
Indie Bench redundancy removal
2022-04-05 23:32:51 +01:00
ash
b232aa579a
Merge pull request #549 from AnonymousRandomPerson/cleanup-quackity
Remove Quackity dupes
2022-04-05 23:32:23 +01:00
ash
4c2bf6c185
Merge pull request #547 from AnonymousRandomPerson/cleanup-hayase
Updated Hayase Nagotoro description
2022-04-05 23:32:09 +01:00
ash
9836112ddc
Merge branch 'master' into reddit 2022-04-05 23:29:16 +01:00
man6168
3d1c63990d
fixed typos and edited descriptions for r/eightysix artworks.
fixed typos and edited descriptions for r/eightysix artworks. Included collaboration information with allies in r/place.
2022-04-05 18:28:22 -04:00
ash
0eb0575fcc
new submissions 2022-04-05 23:27:25 +01:00
Malsententia
c217d12ce7 fix: updated berrytube with detailed description 2022-04-05 15:23:45 -07:00
Austin Albrecht
a102f63697
Replace tx2sjr with a correct entry 2022-04-06 00:23:24 +02:00
Stefano Haagman
d6b6df8d80 Merge branch 'cleanup' 2022-04-06 00:22:28 +02:00
ash
868d07d9a2
patch 2022-04-05 23:15:02 +01:00
ash
d5235f4830
Merge pull request #545 from AnonymousRandomPerson/cleanup-nanachi
Updated Nanachi
2022-04-05 23:10:55 +01:00
ash
1a3299a6fb
Merge pull request #544 from AnonymousRandomPerson/cleanup-cascadia
Fixed Cascadia flag
2022-04-05 23:10:47 +01:00
ash
8e26107b96
Merge pull request #543 from AnonymousRandomPerson/cleanup-forestkingemperor
Removed duplicate forest king emperor
2022-04-05 23:10:35 +01:00
ash
075d49b9b6
Merge pull request #542 from AnonymousRandomPerson/cleaup-shark3ozero
Fixed link for Shark3ozero
2022-04-05 23:10:25 +01:00
ash
7c4d7164d0
Merge pull request #541 from AnonymousRandomPerson/cleanup-dnf
Removed DNF dupes
2022-04-05 23:10:16 +01:00
ash
60ae358539
Merge pull request #540 from JopStro/cleanup
Merge CubeKrowd Duplicates
2022-04-05 23:10:04 +01:00
ash
33ef6f7274
Merge pull request #539 from mystery2me/cleanup
Pathing edit so selection lines don't interfere with artwork, misc. edits.
2022-04-05 23:09:47 +01:00
ash
d3d14ab42a
Merge pull request #536 from AnonymousRandomPerson/cleanup-eighty-six
Removed duplicate Eighty Six entries
2022-04-05 23:09:14 +01:00
ash
337ef6bfe8
Merge pull request #532 from AnonymousRandomPerson/cleanup-menorah
Updated temple menorah
2022-04-05 23:08:40 +01:00
ash
465267fae3
Merge pull request #531 from EnragedRabisu/shibbysays-spiral
Update an Entry's size and path to point to the spiral
2022-04-05 23:08:07 +01:00
AnonymousRandomPerson
467a7003bd Remove Quackity dupes 2022-04-05 18:03:31 -04:00
ash
605c3417ea
Merge pull request #528 from DubyaDude/cleanup
Edit border for VRChat Modding Group
2022-04-05 23:02:30 +01:00
AnonymousRandomPerson
f6fd243943 Updated Hayase Nagatoro 2022-04-05 17:56:17 -04:00
ThePizzaMuncher
63e568fbd1 Changed the boundaries of the chosen “Indie Bench” area entry; removed redundant “Indie Bench” entries 2022-04-05 23:55:25 +02:00
ash
96e2919979
Merge pull request #537 from memmam/cleanup
Fix phosphor hearts in MrRobot alliance
2022-04-05 22:54:16 +01:00
Mystery
8c30ee2c89 Fix pathing. 2022-04-05 23:53:31 +02:00
ash
29bf524c7c
Merge pull request #529 from Nivek770/german_branch_duplicates_2
Merged SO MANY Duplicates on the german Flag
2022-04-05 22:51:55 +01:00
AnonymousRandomPerson
fd386137a0 Updated Nanachi 2022-04-05 17:51:48 -04:00
Mystery
e39892fe2b Revert "Add files via upload"
This reverts commit fba8715398.
2022-04-05 23:51:19 +02:00
AnonymousRandomPerson
21b6b79e9c Fixed Cascadia flag 2022-04-05 17:49:53 -04:00
AnonymousRandomPerson
7d98077d96 Removed duplicate forest king emperor 2022-04-05 17:44:48 -04:00
AnonymousRandomPerson
ddb22a5162 Fixed link for Shark3ozero 2022-04-05 17:42:01 -04:00
AnonymousRandomPerson
4ac29f09f1 Removed DNF dupes 2022-04-05 17:39:43 -04:00
Mystery
fba8715398
Add files via upload 2022-04-05 23:34:58 +02:00
JopStro
c6e811e43a Merge CubeKrowd Duplicates 2022-04-05 22:34:13 +01:00
Ellie M
777fb66bd4
JSON fix 2022-04-05 14:30:31 -07:00
Ellie M
f60e3ed1ce
Fix phosphor hearts in MrRobot alliance 2022-04-05 14:28:09 -07:00
AnonymousRandomPerson
e1cf55b892 Removed duplicate Eighty Six entries 2022-04-05 17:25:17 -04:00
AnonymousRandomPerson
408a97d1fe Updated temple menorah 2022-04-05 17:19:30 -04:00
EnragedRabisu
7f806c73b3 Update coords to point to the spiral 2022-04-05 16:56:19 -04:00
Kevin Hasse
5413a6cd4b Merged SO MANY Duplicates on the german Flag 2022-04-05 22:45:12 +02:00
Usman Shafiq
e6e3eceb8a
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 16:44:51 -04:00
Usman Shafiq
ecb90a2517 Edit border for VRCMG 2022-04-05 16:44:29 -04:00
JopStro
4f41e59ee2 Fix typo in their 2022-04-05 21:38:01 +01:00
Stefano Haagman
a820417402 Merge branch 'cleanup' 2022-04-05 22:22:43 +02:00
Stefano
f47355f020
Merge pull request #520 from Nivek770/german_flag
German Flag Duplicated
2022-04-05 22:21:17 +02:00
ash
67cbb44f84
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 21:19:46 +01:00
ash
a762d96132
patch 2022-04-05 21:19:36 +01:00
Stefano
64d0b77bb2
Merge pull request #521 from recordcrash/cleanup
John Egbert fix on branch cleanup
2022-04-05 22:19:36 +02:00
Stefano Haagman
d603a7891b Merge branch 'cleanup_loser' into cleanup 2022-04-05 22:17:47 +02:00
Makin
8c2436cd91 Added John Egbert fix to cleanup branch 2022-04-05 22:17:35 +02:00
Kevin Hasse
cbdb091d19 Merged most of the duplicates on the german flag
(cherry picked from commit 97f28d7951)
2022-04-05 22:12:51 +02:00
Someone Somewhere
4ce9b1dcb4
Merge pull request #517 from nico-abram/veloren
Fix veloren coordinates
2022-04-05 23:12:37 +03:00
Makin
498c368010 Readded missing John Egbert entry 2022-04-05 22:09:50 +02:00
unknown
d1683b0f55 Fix veloren coordinates 2022-04-05 17:06:47 -03:00
Stefano Haagman
b6f16499b9 Merge remote-tracking branch 'origin/cleanup' into cleanup 2022-04-05 22:05:08 +02:00
Someone Somewhere
760406b4f8
Merge pull request #516 from Wayland-Smithy/cleanup-df
Remove duplicate Dwarf Fortress entry
2022-04-05 23:04:56 +03:00
Stefano Haagman
70df5779e9 Merge branch 'contributions/reddit' into cleanup 2022-04-05 22:04:54 +02:00
Wayland-Smithy
83e7edf534 Remove duplicate 2022-04-05 12:59:37 -07:00
ash
1eb81da6de
reddit contributions 2022-04-05 20:57:08 +01:00
ash
726751135c
Merge pull request #512 from SchneckchenAndy/cleanup
Cleanup Clustertruck submission and remove duplicate
2022-04-05 20:55:01 +01:00
ash
d2cae072d5
Merge pull request #510 from DubyaDude/cleanup
Edit VRChat Logo Description (Grammer mistake)
2022-04-05 20:54:49 +01:00
ash
63388f67a7
Merge pull request #509 from neinwhal/cleanup
Fix entry for r/singapore (id: 133)
2022-04-05 20:54:30 +01:00
ash
d22ddd6e9b
Merge pull request #508 from memmam/cleanup
Vernba fix
2022-04-05 20:54:04 +01:00
ash
eb357bf678
Merge pull request #506 from ForsenPlace/cleanup
Fixed and improved Peppah's entry
2022-04-05 20:53:46 +01:00
ash
42a7f58fa9
Merge pull request #513 from JopStro/cleanup
Fix typo in word development
2022-04-05 20:52:29 +01:00
Stefano Haagman
8a403e4709 Merge branch 'cleanup' 2022-04-05 21:51:35 +02:00
JopStro
eaea6327e2 Fix typo in word development 2022-04-05 20:49:34 +01:00
Andreas
4ed1db6e33
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 21:49:17 +02:00
ash
0a04a543fc
math 2022-04-05 20:48:35 +01:00
SchneckchenAndy
5e01dfce4a
Cleanup Clustertruck submission and remove duplicate 2022-04-05 21:48:25 +02:00
ash
06f4bbef4c
quackity 2022-04-05 20:47:14 +01:00
ash
b1448864bb
scp 2022-04-05 20:46:20 +01:00
ash
4a31b36411
benchy 2022-04-05 20:45:15 +01:00
ash
73aeb5b77c
uk 2022-04-05 20:44:21 +01:00
ash
de806e56d1
homestuck 2022-04-05 20:42:47 +01:00
ash
5715773769
dbz 2022-04-05 20:42:14 +01:00
ash
0ac7121157
mlp 2022-04-05 20:41:36 +01:00
ash
b2ca1838fb
titanfolk 2022-04-05 20:41:10 +01:00
ash
86bff24ab6
f1 2022-04-05 20:40:29 +01:00
ash
7500217793
uc 2022-04-05 20:40:06 +01:00
ash
bb0fdbdcdb
scrapmechanic 2022-04-05 20:38:53 +01:00
ash
5063f84b1a
elchatese 2022-04-05 20:38:29 +01:00
ash
2dede62d80
murica 2022-04-05 20:37:00 +01:00
ash
49396a8122
placepride 2022-04-05 20:34:17 +01:00
ash
aa6466cbb0
tf2 2022-04-05 20:33:34 +01:00
ash
2e0abdd011
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 20:32:08 +01:00
ash
5698f8210b
beljum 2022-04-05 20:32:03 +01:00
Stefano Haagman
4dcb9f6683 Merge branch 'updates' into cleanup 2022-04-05 21:31:47 +02:00
ash
bb35857d06
jesus fucking christ france 2022-04-05 20:30:28 +01:00
Usman Shafiq
2bab4ac352 Edit VRChat Logo Description (Grammer mistake) 2022-04-05 15:29:39 -04:00
Stefano Haagman
4779d8fb53 Merge branch 'cleanup_tupper' into cleanup 2022-04-05 21:29:00 +02:00
ash
c44868c815
FRANCE 2022-04-05 20:28:03 +01:00
neinwhal
c518e09599 Edit r/singapore 2022-04-06 03:26:58 +08:00
Stefano Haagman
b6406b9c33 Added overlap mode. 2022-04-05 21:26:54 +02:00
Ellie M
4a2da1eac9
Vernba fix 2022-04-05 12:26:04 -07:00
ash
77c5a3724d
cleanup 2022-04-05 20:25:39 +01:00
ash
87b66e5157
Matsumoto 2022-04-05 20:25:00 +01:00
ash
7372141525
ralsei my beloved 2022-04-05 20:23:39 +01:00
ash
ad881402b2
teardown 2022-04-05 20:23:10 +01:00
ash
8c8484f012
pulsus 2022-04-05 20:22:53 +01:00
ash
a98fc7ce9f
pulsus 2022-04-05 20:22:28 +01:00
ash
1f5998b711
finland arms 2022-04-05 20:21:54 +01:00
ash
d41790fe5a
legion413 2022-04-05 20:21:37 +01:00
ash
9409e22878
david 2022-04-05 20:21:07 +01:00
ash
88e67796a8
sistine chapel 2022-04-05 20:20:45 +01:00
ash
e50edae3ce
philipine 2022-04-05 20:20:13 +01:00
ForsenPlace
e615e2af07 Improved and expanded description, removed wrong statements, fixed misattribution and corrected typos 2022-04-05 21:19:26 +02:00
ash
087a67132e
seven provinces 2022-04-05 20:19:09 +01:00
ash
ff84ac5409
rainbowdash 2022-04-05 20:18:09 +01:00
ash
1aad1c3071
amongo 2022-04-05 20:17:43 +01:00
ash
264df8b67f
madoka 2022-04-05 20:17:10 +01:00
ash
ca677e2a10
night watch 2022-04-05 20:16:45 +01:00
ash
34592fefb7
shapez 2022-04-05 20:15:31 +01:00
ash
2301a7d610
mlp 2022-04-05 20:15:04 +01:00
ash
c57886191e
vtlatam 2022-04-05 20:14:04 +01:00
ash
3aa6ffc1b8
bleach 2022-04-05 20:13:12 +01:00
ash
144560a707
Merge pull request #498 from howardt12345/taiwan-edit-links
Edit: Taiwan links and info
2022-04-05 20:05:37 +01:00
ash
f1e044e542
Merge pull request #497 from luisxmz/cleanup
Panama artwork description (Edit)
2022-04-05 20:05:21 +01:00
ash
b9f6393e3f
Merge pull request #495 from sciencecw2020/cleanup
Update on HK and XJPooh Entries
2022-04-05 20:05:03 +01:00
ash
ad17e0b12b
Merge pull request #494 from DubyaDude/cleanup
Edit Cirno/Tupper Pixel Art next to VRChat Logo
2022-04-05 20:04:52 +01:00
ash
e1907a5e31
Merge pull request #492 from Zednuk/Changes-to-twrd09
Corrected the name and description #3 try
2022-04-05 20:00:12 +01:00
Makin
2b146cdb98 Added proper website for Legion 413 2022-04-05 20:49:34 +02:00
Makin
4c320f139f Clarified Legion 413 2022-04-05 20:46:03 +02:00
Tupper
adf2354e76 Fix incorrect VRChat art attribution
This art is specifically depicts a VRChat developer.
2022-04-05 11:45:38 -07:00
Makin
0fe0b9c88a Fixed John Egbert entry 2022-04-05 20:42:05 +02:00
Luis Sánchez
adb703f631 edited panama artwork description 2022-04-05 13:26:00 -05:00
imaloser71
f4e19f7b09
Fix positioning and if of entries
resubmitted under cleanup branch per request
2022-04-05 20:25:13 +02:00
sciencecw2020
510475faa9
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 14:14:55 -04:00
Stefano Haagman
36607dcb44 Another one 2022-04-05 20:09:29 +02:00
Stefano Haagman
a690788b59 Somehow this one got massive lines across half the atlas, deleted for now. 2022-04-05 20:09:00 +02:00
ann4belle
08ebb18762
Removed ID 69 (not present) 2022-04-05 13:05:00 -05:00
Kak Wong
aeb5970d27 Merge branch 'cleanup' of https://github.com/Codixer/place-atlas into cleanup 2022-04-05 14:04:10 -04:00
ann4belle
5a661f33e2
Removed ID 49 (not present) 2022-04-05 13:03:53 -05:00
ann4belle
f0dabf68d4
Removed ID 48 (bad description) 2022-04-05 13:03:39 -05:00
Usman Shafiq
1c7ade1ce0 Edit Cirno/Tupper Pixel Art Website Link 2022-04-05 14:02:39 -04:00
ann4belle
6bbdd72ec2
Removed ID 44 (not present) 2022-04-05 13:02:11 -05:00
Usman Shafiq
9ab6c0b1b4 Edit Cirno/Tupper Pixel Art 2022-04-05 14:01:59 -04:00
ann4belle
0638d67dcd
Resized ID 43 2022-04-05 13:01:23 -05:00
ann4belle
189e410f2a
Removed ID 38 (not present) 2022-04-05 12:58:41 -05:00
ann4belle
432eb590a1
Resized ID 33 2022-04-05 12:57:56 -05:00
Zednuk
b7a569244c Corrected the name and description 2022-04-05 20:55:25 +03:00
Stefano
64e6edfc9f
Merge pull request #491 from OptoCloud/patch-4
Clean up C++ description
2022-04-05 19:54:42 +02:00
OptoCloud
e67b43cae6
Clean up C++ description 2022-04-05 19:54:10 +02:00
ann4belle
8f0fc79de6
Removed ID 29 (not present) 2022-04-05 12:53:40 -05:00
ann4belle
bd8e332682
Removed ID 27 (not present) 2022-04-05 12:53:22 -05:00
ann4belle
f2fa7d2f47
Updated text for ID 26 2022-04-05 12:53:05 -05:00
Stefano Haagman
1b3532eee2 Merge branch 'proper-subreddit-format' 2022-04-05 19:52:48 +02:00
ann4belle
21dd56e9ab
Resized ID 24 2022-04-05 12:51:39 -05:00
Stefano Haagman
182b4bced7 Merge branch 'cleanup' 2022-04-05 19:51:19 +02:00
Usman Shafiq
1b80cb2f47 Edit VRCMG Border 2022-04-05 13:46:24 -04:00
ann4belle
4690c0a941
Resized ID 17 2022-04-05 12:43:41 -05:00
ann4belle
4f25773ea5
Resized ID 20 2022-04-05 12:41:58 -05:00
Kak Wong
eb6f396e89 Update HK and XJPooh Entries
ID: twnkbf, 000146
2022-04-05 13:40:44 -04:00
ash
e59c45fe6b
Merge pull request #485 from ann4belle/cleanup
Removed ID 0 (Pinewood) (not present)
2022-04-05 18:40:36 +01:00
ann4belle
eff0579d29
Removed ID 0 (Pinewood) (not present) 2022-04-05 12:38:58 -05:00
ash
b6f89ad957
#398 2022-04-05 18:38:40 +01:00
Hans5958
01c057637d Proper subreddit format 2022-04-06 00:38:03 +07:00
ash
a49ffd1cb8
#447 2022-04-05 18:36:19 +01:00
ash
456e6217f8
Merge pull request #481 from DubyaDude/cleanup
Cleanup of VRChat Logo
2022-04-05 18:31:34 +01:00
ash
214ef8a1fd
accept merge 2022-04-05 18:29:36 +01:00
Usman Shafiq
66806e118b Cleanup of VRChat Logo 2022-04-05 13:29:29 -04:00
Siphalor
25fa90f1c2 Merge remote-tracking branch 'upstream/cleanup' into patch-fix-md-links-2 2022-04-05 19:20:48 +02:00
Siphalor
088c1d8ebc Merge remote-tracking branch 'upstream/cleanup' into patch-fix-md-links-2 2022-04-05 19:19:54 +02:00
ash
f5fd47e9f9
Merge pull request #471 from JTHicks26/master
Remove incorrect attributions to /r/ADVChina
2022-04-05 18:19:38 +01:00
ash
85d3bbaf01
Merge pull request #473 from AnonymousRandomPerson/cleanup-mystery-dungeon
Cleaned up Pokémon Mystery Dungeon entries
2022-04-05 18:19:02 +01:00
Cheng Hann Gan
c309d0184a Cleaned up Pokémon Mystery Dungeon entries 2022-04-05 13:18:11 -04:00
ash
4fc78b40e6
Merge pull request #470 from DubyaDude/cleanup
Edit VRCat Description
2022-04-05 18:17:57 +01:00
Siphalor
7f1d828144 Fix URLs formatted as Markdown 2022-04-05 19:17:05 +02:00
ash
39e905d109
Merge pull request #468 from johnnypuskar/master
Updating SHIELD and Hydra logos with proper credit and descriptors
2022-04-05 18:14:20 +01:00
ash
b2ead5019f
Merge pull request #467 from Lomikron/master
Fixed Outline of twqr4q
2022-04-05 18:13:49 +01:00
ash
ebc0ba5db4
Merge pull request #465 from n9iels/fix/mnot
Fix placement of MNOT (the can with glasses)
2022-04-05 18:13:19 +01:00
Usman Shafiq
3ebaa650fa Edit VRCat Description 2022-04-05 13:13:05 -04:00
ash
12c54015a1
Merge pull request #462 from Kiglirs/cleanup
Modified Missing Texture and its id
2022-04-05 18:12:05 +01:00
ash
035333a772
Merge pull request #458 from AnonymousRandomPerson/cleanup-runescape
Cleaned up RuneScape entries
2022-04-05 18:11:00 +01:00
ash
474a1c9fdc
Merge pull request #451 from Falki-git/master
Fix Kerbal Space Program web address & remove duplicate
2022-04-05 18:09:43 +01:00
Aeywoo
16fc74e7ed
Merge branch 'master' into atlas-edits 2022-04-06 02:39:41 +09:30
Someone Somewhere
f52d10ea0a Update atlas.json 2022-04-05 20:08:26 +03:00
n9iels
c643dc0227 Fix placement of MNOT (the can with glasses) 2022-04-05 19:07:01 +02:00
ash
c5889ec623
Merge pull request #435 from RobertRR11/cleanup
Remove wrong entries for "Compliance Logo"
2022-04-05 18:06:18 +01:00
Someone Somewhere
6b60d2a68a Update atlas.json 2022-04-05 20:05:56 +03:00
ash
9145be48c8
Merge pull request #434 from jogerj/master
r/VTubers collaborations
2022-04-05 18:05:35 +01:00
Someone Somewhere
54154591be Update atlas.json 2022-04-05 20:04:20 +03:00
ash
b86e9eaa0b
Merge pull request #429 from cr4yfish/master
remove false information/duplicate from #twpvsp
2022-04-05 18:03:19 +01:00
Someone Somewhere
44e44946e6 Update atlas.json 2022-04-05 20:03:12 +03:00
ash
8bb05f7726
Merge pull request #426 from SayaDuck/cleanup
Fixed smaller wynncraft logo's outline, description, and links
2022-04-05 18:02:27 +01:00
Someone Somewhere
2767392ec1 Update atlas.json 2022-04-05 20:01:25 +03:00
ash
fc694063c1
Merge pull request #424 from kelvinsi/cleanup
Cleanup Genshin overlaps
2022-04-05 17:59:47 +01:00
Someone Somewhere
dd39d4fb07 Update atlas.json 2022-04-05 19:59:37 +03:00
Someone Somewhere
9714ad4433 Update atlas.json 2022-04-05 19:55:44 +03:00
Someone Somewhere
2857684369 Update atlas.json 2022-04-05 19:55:03 +03:00
ash
8c6578cc71
Merge branch 'master' into n9iels-patch-night-watch 2022-04-05 17:53:48 +01:00
Kiglirs
fb50e1c09b Modified Missing Texture and its id 2022-04-05 18:53:18 +02:00
Someone Somewhere
21c3ca3723 Update atlas.json 2022-04-05 19:52:49 +03:00
Someone Somewhere
2769ea957c Update atlas.json 2022-04-05 19:52:17 +03:00
Someone Somewhere
1b9bf3c11f Merge branch 'atlas-edits' of https://github.com/Codixer/place-atlas into atlas-edits 2022-04-05 19:50:14 +03:00
Someone Somewhere
7f7e54b893 Update atlas.json 2022-04-05 19:50:08 +03:00
ash
5744c35ff0
accept merge 2022-04-05 17:49:02 +01:00
Someone Somewhere
34fbfd3f02 Update atlas.json 2022-04-05 19:47:10 +03:00
Cheng Hann Gan
3059096100 Cleaned up RuneScape entries 2022-04-05 12:44:23 -04:00
ash
bf00151e94
Merge branch 'master' into patch-boot 2022-04-05 17:42:49 +01:00
ash
78fd2e7dd3
Merge branch 'master' into patch-boot 2022-04-05 17:42:02 +01:00
Someone Somewhere
481e2887a3
Merge branch 'master' into patch-6 2022-04-05 19:41:56 +03:00
Someone Somewhere
fd7816dd70
Merge pull request #455 from zeroclutch/cleanup
Edit: Combine three overlapping entries of Nico Rosberg into one comprehensive overview
2022-04-05 19:41:09 +03:00
johnnypuskar@yahoo.com
56eab1ddba Updated the description of the SHIELD logo to reference the Agents of SHIELD show, which is what the responsible subreddit linked is actually about. 2022-04-05 12:41:00 -04:00
zero
24896e9747 Edit: Combine three overlapping entries of Nico Rosberg into one comprehensive overview 2022-04-05 09:39:20 -07:00
ash
696f8ea6e5
Merge branch 'master' into master 2022-04-05 17:36:47 +01:00
Someone Somewhere
1a1beb3ec9
Merge branch 'master' into atlas-edits 2022-04-05 19:36:16 +03:00
johnnypuskar@yahoo.com
1c69e47e24 Edited the description and the linked subreddit for the Hydra logo. The Agents of SHIELD subreddit r/shield were the ones who organized to build it, so they've been properly credited, and the description has been updated to reference Hydra from the shows point of view. 2022-04-05 12:30:39 -04:00
xyr11
1dfe1fd328
Fixed Encanto butterfly 2022-04-06 00:25:52 +08:00
Axel
367209c5ca Fix a typo on the streamer's name kameto 2022-04-05 16:22:56 +00:00
Stefano
3eabf9b712
Merge branch 'master' into atlas-edits 2022-04-05 18:19:30 +02:00
Wendelstein7
0aab217bd9
Merge branch 'master' into master 2022-04-05 18:17:13 +02:00
Someone Somewhere
fb7ea62344 Update atlas.json 2022-04-05 19:16:47 +03:00
Someone Somewhere
df1e548d11 Various edits 2022-04-05 19:14:08 +03:00
Stefano Haagman
a0f937d32a Removed any mentions to bost 2022-04-05 18:13:23 +02:00
Wendelstein7
0ca0c3460e Removed conflicting uninformative annotation 2022-04-05 18:09:47 +02:00
Falki
7a393ff64c
Merge branch 'Codixer:master' into master 2022-04-05 18:09:40 +02:00
Wendelstein7
9cd18f80b6 Merge branch 'master' of https://github.com/Codixer/place-atlas into Codixer-master 2022-04-05 18:05:06 +02:00
Falki-git
7c10fe64f7 Fix Kerbal Space Program web address, remove duplicate
- Fix web address for id 000465: add https://
- Remove duplicate with ID: twpo1b
2022-04-05 18:04:00 +02:00
xyr11
36249af213
Fixed entries by r/Philippines 2022-04-06 00:03:22 +08:00
jogerj
039aabad1a
cleanup r/placestart area for vtuber logos. compiled into single entry 2022-04-05 17:59:54 +02:00
Wendelstein7
ae8ab15355 Improved annotations of 3 vegan works 2022-04-05 17:55:01 +02:00
Someone Somewhere
2ae3e65d16 Update atlas.json 2022-04-05 18:54:01 +03:00
Someone Somewhere
a867725f83 Update atlas.json 2022-04-05 18:52:31 +03:00
ash
7e2fbf97e3
reddit contributions 2022-04-05 16:51:46 +01:00
JT
c54196d8c1
Remove incorrect attributions to /r/ADVChina 2022-04-05 10:49:22 -05:00
jogerj
32317211c3
sync removed items with upstream 2022-04-05 17:28:22 +02:00
wavetro
e03f6c07d3
Removed non-functional markdown 2022-04-05 11:25:21 -04:00
jogerj
4c062bd3db Merge branch 'cleanup' of https://github.com/Codixer/place-atlas into Codixer-cleanup 2022-04-05 17:25:05 +02:00
wavetro
286416e5d5
Removed duplicates 2022-04-05 11:20:10 -04:00
Robert Reichel
04f8b8b91f remove wrong entries for "Compliance Logo" and edit path 2022-04-05 17:19:44 +02:00
Howard Tseng
85fddb6083 added submitted by parameter 2022-04-05 11:17:38 -04:00
Howard Tseng
ebef398fa9 Edit: Taiwan entry links
- Edited Taiwan's entries to have links for Taiwan
2022-04-05 11:16:22 -04:00
Cr4yfish
8b44baf34d remove false information/duplicate from #twpvsp 2022-04-05 17:13:43 +02:00
SayaDuck
e6aa401290 Fixed smaller wynncraft logo's outline, description, and links 2022-04-05 11:09:45 -04:00
jogerj
3b66117c3e
added text from #37 2022-04-05 16:55:43 +02:00
jogerj
106efc6563
Adds Okayu pixel art #12 2022-04-05 16:53:25 +02:00
ash
f6489b747a
reddit contributions 2022-04-05 15:45:07 +01:00
Kelvin
e647542a7d undo bad merge 2022-04-05 10:41:47 -04:00
Kelvin
b4ba992a66 clean up Genshin overlaps 2022-04-05 10:37:47 -04:00
ash
b0936139a1
Merge branch 'master' into cleanup 2022-04-05 15:32:10 +01:00
ash
ccea78a154
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 15:31:40 +01:00
ash
5831f59565
spyro 2022-04-05 15:31:06 +01:00
ash
75377d096a
LPOTL 2022-04-05 15:28:01 +01:00
Someone Somewhere
1874a9b550
Merge branch 'master' into master 2022-04-05 17:28:01 +03:00
ash
1f63677b80
suisei 2022-04-05 15:26:25 +01:00
Someone Somewhere
cdf4a96c90
Merge branch 'master' into removewin7 2022-04-05 17:26:10 +03:00
Someone Somewhere
3591f38dd6
Merge branch 'master' into addthing 2022-04-05 17:24:25 +03:00