Commit graph

787 commits

Author SHA1 Message Date
Siphalor 25fa90f1c2 Merge remote-tracking branch 'upstream/cleanup' into patch-fix-md-links-2 2022-04-05 19:20:48 +02:00
Someone Somewhere a7320787f0
Merge pull request #466 from Codixer/atlas-edits
Atlas edits
2022-04-05 20:20:20 +03: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
ash f54e183968
Merge branch 'master' into fix_url_id_param 2022-04-05 18:08:48 +01:00
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
Cheng Hann Gan 7a90481b04 Ignored Mac .DS_Store files and VSCode files 2022-04-05 13:04:51 -04: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
ash b3e8db5ed2
Merge pull request #460 from Codixer/n9iels-patch-night-watch
N9iels patch night watch
2022-04-05 17:58:39 +01: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 425b3bc1c4
Merge pull request #389 from n9iels/patch-boot
Remove duplicate items of the boat
2022-04-05 17:43:44 +01:00
ash bf00151e94
Merge branch 'master' into patch-boot 2022-04-05 17:42:49 +01:00
Someone Somewhere 1a73d767e6
Merge pull request #452 from xyr11/patch-6
Fixed Encanto butterfly
2022-04-05 19:42:38 +03: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
Someone Somewhere 5a476a111b
Merge pull request #453 from 4xe1/master
Fix a typo on the streamer's name kameto
2022-04-05 19:40:05 +03:00