Commit graph

550 commits

Author SHA1 Message Date
ash
78fd2e7dd3
Merge branch 'master' into patch-boot 2022-04-05 17:42:02 +01: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
ash
9b76094351
Merge pull request #442 from Wendelstein7/master
Improved annotations of 3 vegan works
2022-04-05 17:27:46 +01: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
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
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
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
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
Someone Somewhere
a09140b781
Merge pull request #427 from SayaDuck/master
Readme edits for clarity & grammar, correct branch for duplicate, fix…
2022-04-05 18:18:10 +03:00
Jonathan Lee
27227640b0
Fixed the other broken link 2022-04-05 11:16:18 -04:00
Jonathan Lee
6ac21e4ea1
Readme edits for clarity & grammar, correct branch for duplicate, fixed link 2022-04-05 11:14:11 -04:00
Aeywoo
b28541a765
Merge pull request #422 from Codixer/cleanup
Update README.md
2022-04-06 00:21:09 +09:30
ash
e4097e4aa0
Update README.md 2022-04-05 15:49:27 +01:00
ash
bdbc2f1021
Merge pull request #420 from Codixer/contributions/reddit
reddit contributions
2022-04-05 15:48:03 +01:00
ash
f6489b747a
reddit contributions 2022-04-05 15:45:07 +01:00
Aeywoo
bf84d5190c
Merge pull request #406 from Codixer/cleanup
setup for cleanup
2022-04-06 00:08:39 +09:30
ash
3ec0a9bd2d
Update main.js 2022-04-05 15:37:39 +01: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
Someone Somewhere
20a6fe9ee8
Merge pull request #409 from Jabster28/master
fix: typo for windows taskbar
2022-04-05 17:28:57 +03: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
Someone Somewhere
9eee0ec761
Merge pull request #412 from Jabster28/removewin7
fix: remove windows 7 taskbar
2022-04-05 17:26:40 +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
228fc9c396
Merge pull request #411 from Roadcrosser/addthing
Update Trash Taste description
2022-04-05 17:24:56 +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
Someone Somewhere
08d27ec25e
Merge pull request #415 from galenguyer/master
Fix description for Computer Science House
2022-04-05 17:22:56 +03: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