Commit graph

589 commits

Author SHA1 Message Date
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
ash
88c59510c5
boobs folder 2022-04-05 15:24:15 +01:00
Someone Somewhere
8e339574c5
Merge pull request #414 from Roadcrosser/master
Remove Trash Taste After Dark subset submission
2022-04-05 17:23:47 +03:00
ash
76fe7d1fda
bad path 2022-04-05 15:23:20 +01:00
ash
4cb4e10a8e
vietnam 2022-04-05 15:22:52 +01:00
Someone Somewhere
6fee690ce6
Merge branch 'master' into master 2022-04-05 17:22:30 +03:00
ash
2608e977c4
stiens gate 2022-04-05 15:22:04 +01:00
ash
05fcfc4e10
spam 2022-04-05 15:20:27 +01:00
ash
595138a04d
spam 2022-04-05 15:19:30 +01:00
Galen Guyer
88a0197853
Fix description for Computer Science House 2022-04-05 10:19:20 -04:00
Niels van der Veer
90f145c406
Merge branch 'master' into patch-night-watch 2022-04-05 16:18:57 +02:00
ash
9cf499c62e
enviosity 2022-04-05 15:16:50 +01:00
ash
09b7ebad51
valhalla 2022-04-05 15:15:33 +01:00
ash
fc00762f17
dead cells 2022-04-05 15:15:00 +01:00
Lars Bollmann
0a2839be8d Fixed Outline if twqr4q 2022-04-05 16:14:26 +02:00
ash
f1d5a45378
puck 2022-04-05 15:13:39 +01:00
ash
fc8073c002
jerma 2022-04-05 15:12:31 +01:00
ash
57459f990d
void 2022-04-05 15:11:14 +01:00
ash
f4c2e54ebc
inscryption 2022-04-05 15:10:13 +01:00
prezmop
76d36f052e Updated the description for The Sun 2022-04-05 16:10:11 +02:00
ash
2d7e71d325
foob 2022-04-05 15:09:05 +01:00
ash
8ec7880260
madotsuki 2022-04-05 15:07:52 +01:00
jogerj
5aeea1d3c0
Adds FlareWheeze #11 and fixes duplicate 2022-04-05 16:07:35 +02:00
ash
119782686a
philipines 2022-04-05 15:06:37 +01:00
Roadcrosser
e56bc91ce9
Merge branch 'Codixer:master' into addthing 2022-04-05 22:06:20 +08:00
Roadcrosser
97d1cb2072 Update Trash Taste Description 2022-04-05 22:05:42 +08:00
ash
e913a835be
germany 2022-04-05 15:02:44 +01:00
ash
a7f626af5d
rimuru 2022-04-05 15:01:02 +01:00
ash
3dfc91d9ee
noggin 2022-04-05 14:59:16 +01:00
ash
8b20165c87
komi 2022-04-05 14:58:40 +01:00
ash
92fa64d475
starship 2022-04-05 14:57:42 +01:00
ash
8307bcd717
straya 2022-04-05 14:56:45 +01:00
Jabster28
a341d88762
fix: remove windows 7 menu 2022-04-05 14:55:15 +01:00
ash
2dc1ec69df
ny jets 2022-04-05 14:53:33 +01:00
jogerj
e60bdb185b
Resolved "Suisex" from #23 and #26 and duplicates already on board 2022-04-05 15:52:57 +02:00
ash
21f9c19ee4
fubuking 2022-04-05 14:52:03 +01:00
ash
a7b0cebeec
hornet 2022-04-05 14:50:42 +01:00
ash
dbae1badf2
warrior cats 2022-04-05 14:49:55 +01:00
ash
5a5f95bd87
mcsr path 2022-04-05 14:48:15 +01:00
Jabster28
6db07c6b50
fix: typo for windows taskbar 2022-04-05 14:47:05 +01:00
ash
d326084681
fix hatsune miku path 2022-04-05 14:45:04 +01:00
ash
43d7590703
no longer present 2022-04-05 14:42:32 +01:00
ash
0b3e33e241
scott the woz 2022-04-05 14:41:59 +01:00
ash
61800d64e2
sonic 2022-04-05 14:40:28 +01:00
ash
de406132cc
belkan flag 2022-04-05 14:39:49 +01:00
ash
b90fe8c0a3
green lattice 2022-04-05 14:37:28 +01:00
ash
bab27e1d97
mlp crystal 2022-04-05 14:36:28 +01:00
ash
d075ad6d74
knight and arknight 2022-04-05 14:34:59 +01:00
Niels van der Veer
0ed66396ba
Merge branch 'master' into patch-night-watch 2022-04-05 15:23:32 +02:00
Niels van der Veer
a4ac26d56d
Merge branch 'master' into patch-boot 2022-04-05 15:23:30 +02:00
ash
525a7887ea
new reddit submissions 2022-04-05 14:22:02 +01:00
Roadcrosser
ee7b6e5575 Remove Trash Taste After Dark submission 2022-04-05 21:02:54 +08:00
ash
8331a06423
new reddit submissions 2022-04-05 13:53:09 +01:00
n9iels
3163fcf46f Remove duplicate items of the Night Watch 2022-04-05 14:16:33 +02:00
n9iels
c149a6c0f8 Remove duplicate items of the boat 2022-04-05 14:14:07 +02:00
Epicgamer2469
7ee82e1de7 Fix Shelly (Small) Path 2022-04-05 06:41:31 -05:00
ash
64de9ef6a1
merge fix 2022-04-05 12:12:36 +01:00
ash
a6f352753b
merge 2022-04-05 12:05:48 +01:00
ash
1933a5aebd
latest reddit updates and dupe prevention logic 2022-04-05 11:55:45 +01:00
Aeywoo
e40a2730b0
Merge branch 'master' into master 2022-04-05 20:15:15 +09:30
asivery
cc88efcf36 Removed XSS in infoblock creation, moved infoblock creation into a separate file, formatted atlas.json and made it distinct by description if it's longer than 10 characters 2022-04-05 12:32:59 +02:00
ash
989f11f4cc
latest reddit updates 2022-04-05 11:32:11 +01:00
ash
e98e52d0c6
fix newlines on json 2022-04-05 11:10:50 +01:00
asivery
399dfad357 JSON, IDs migration 2022-04-05 11:48:15 +02:00