MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2024-11-10 03:54:05 +01:00
Code Issues Projects Releases Wiki Activity
1001 commits 3 branches 0 tags 1.7 GiB
Commit graph

1001 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
zero
24896e9747 Edit: Combine three overlapping entries of Nico Rosberg into one comprehensive overview 2022-04-05 09:39:20 -07:00
ash
374ec49299
Merge pull request #385 from Epicgamer2469/master 
Fix Shelly (Small) Path
 2022-04-05 17:38:13 +01:00
ash
696f8ea6e5
Merge branch 'master' into master 2022-04-05 17:36:47 +01:00
Someone Somewhere
6ab2c653c0
Merge pull request #449 from Codixer/atlas-edits 
Atlas edits
 2022-04-05 19:36:40 +03: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
ash
9b76094351
Merge pull request #442 from Wendelstein7/master 
Improved annotations of 3 vegan works
 2022-04-05 17:27:46 +01:00
xyr11
1dfe1fd328
Fixed Encanto butterfly 2022-04-06 00:25:52 +08:00
Malte Jürgens
093ca15595
Merge branch 'master' into fix_url_id_param 2022-04-05 18:25:43 +02:00
Hans5958
e0ed34cdda Only run CI when necessary 
CI will be triggered when web/atlas.json is edited
Name change also because clarity and why not eh
 2022-04-05 23:23:08 +07: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
Malte Jürgens
cb98d20121
Fix URL id param 2022-04-05 18:09:47 +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
5e3230a371 Merge branch 'Codixer-master' 2022-04-05 18:05:20 +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
Stefano
d827f3433e
Merge pull request #438 from Codixer/contributions/reddit 
reddit contributions
 2022-04-05 17:56:57 +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
Malte Jürgens
f5b490124e
Change name to "The 2022 /r/place Atlas" 2022-04-05 17:53:01 +02:00
Someone Somewhere
a867725f83 Update atlas.json 2022-04-05 18:52:31 +03:00
ash
54400449cb
Merge branch 'master' into contributions/reddit 2022-04-05 16:52:16 +01:00
ash
7e2fbf97e3
reddit contributions 2022-04-05 16:51:46 +01:00
ash
c12f8b004c
Merge pull request #437 from Hans5958/readme 
README and CONTRIBUTING changes
 2022-04-05 16:50:37 +01:00
JT
c54196d8c1
Remove incorrect attributions to /r/ADVChina 2022-04-05 10:49:22 -05:00
Hans5958
7ac63b2edf README and CONTRIBUTING changes 
- Clarify message to go to r/placeatlas2 if don't know GitHub
- Sync contents of CONTRIBUTING.md
- Make heading levels correct, make notice in html so it won't be included in GitHub TOC
- Add GitHub but commented for the time when GitHub additions are allowed
 2022-04-05 22:47:05 +07:00
Howard Tseng
e1516dbfa9
Merge branch 'master' into taiwan-edit-links 2022-04-05 11:31:03 -04:00
jogerj
d54fc4af21 Merge branch 'master' of https://github.com/jogerj/place-atlas 2022-04-05 17:28:32 +02:00
jogerj
32317211c3
sync removed items with upstream 2022-04-05 17:28:22 +02:00