Commit graph

2606 commits

Author SHA1 Message Date
Someone Somewhere
07155f9353
Merge pull request #77 from Pabszito/patch-1
Change "OSU" to "osu!", add Rocket League
2022-04-05 12:12:38 +03:00
Someone Somewhere
0b83952e7c
Merge branch 'master' into patch-1 2022-04-05 12:12:05 +03:00
ash
a72dfe73c7
Merge branch 'master' into contributions/reddit-1 2022-04-05 10:11:16 +01:00
Aeywoo
7492129177
Merge pull request #334 from Codixer/m654z-patch-1
Fix unbalanced brackets
2022-04-05 18:39:55 +09:30
ash
12e3d6aa58
Update main.js 2022-04-05 10:08:32 +01:00
ash
ea5f33c35c
Update atlas.js 2022-04-05 10:07:40 +01:00
Someone Somewhere
d80b5d68ac
Fix unbalanced brackets 2022-04-05 12:07:06 +03:00
ash
f87fac2d24
Merge branch 'master' into contributions/reddit-1 2022-04-05 10:05:45 +01:00
enshael
9b48119ebe Convert to uuid 2022-04-05 16:58:44 +08:00
Someone Somewhere
af1c8a8001
Merge pull request #74 from flokkies/patch-1
add Gem Galaxies
2022-04-05 11:55:45 +03:00
Someone Somewhere
c6cb146970
Merge branch 'master' into patch-1 2022-04-05 11:55:21 +03:00
Someone Somewhere
5d1a605b02
Merge pull request #73 from wafflecoffee/patch-4
Add Modrinth
2022-04-05 11:53:27 +03:00
Someone Somewhere
a916639310
Merge branch 'master' into patch-4 2022-04-05 11:53:11 +03:00
ash
fbf9765fe7
new submissions, checking for dupes 2022-04-05 09:51:22 +01:00
Someone Somewhere
734a556425
Merge pull request #72 from TheDjgamerProductions/patch-1
Added Genshin Impact Icon
2022-04-05 11:50:48 +03:00
Someone Somewhere
7cfb298a5d
Merge branch 'master' into patch-1 2022-04-05 11:50:20 +03:00
Someone Somewhere
4cf98f259a
Merge pull request #71 from Alcom1/patch-1
Updated atlas.js - "MechWarrior Timber Wolf"
2022-04-05 11:48:34 +03:00
Someone Somewhere
ee5df9ace6
Merge branch 'master' into patch-1 2022-04-05 11:48:16 +03:00
Someone Somewhere
018f221dd2
Merge pull request #20 from rm20killer/patch-2
added the 2nd hytale icon & changed hytales desc
2022-04-05 11:44:09 +03:00
Someone Somewhere
c555a44797
Merge branch 'master' into patch-2 2022-04-05 11:43:43 +03:00
Someone Somewhere
aa7aa1f76e
Merge pull request #315 from Oliverikx/patch-3
Update atlas.js
2022-04-05 11:37:14 +03:00
Someone Somewhere
084c81caa7
Merge branch 'master' into patch-3 2022-04-05 11:36:55 +03:00
Aeywoo
30350d6f43
Merge pull request #300 from SkytAsul/patch-1
More accurate french flag area description
2022-04-05 18:06:40 +09:30
Someone Somewhere
45f2357e27
Merge branch 'master' into patch-3 2022-04-05 11:36:36 +03:00
Aeywoo
9bbdc6c6f0
Merge branch 'master' into patch-1 2022-04-05 18:05:38 +09:30
Someone Somewhere
def917db0f
Merge pull request #317 from Falki-git/master
Add Kerbal Space Program
2022-04-05 11:33:27 +03:00
Someone Somewhere
42a0c6c619
Merge branch 'master' into master 2022-04-05 11:33:08 +03:00
Someone Somewhere
70fd4effba
Merge pull request #316 from Infernio/she-ra-edit
Update location of She-Ra corner
2022-04-05 11:32:03 +03:00
Falki
9d7ffd9d81
Update atlas.js 2022-04-05 10:28:36 +02:00
Infernio
32d840fef0 Update location of She-Ra corner
We had to rebuilt it elsewhere. Also improve description.

Broken out of #274 to make it easier to merge.
2022-04-05 10:27:11 +02:00
Oliverikx
7de07d25ef
Update atlas.js 2022-04-05 10:25:56 +02:00
ash
e7e2bc14c5
Merge branch 'master' into contributions/reddit-1 2022-04-05 09:06:01 +01:00
Stefano
5b134b3c00
Merge pull request #302 from Aeywoo/master
Updated website files.
2022-04-05 09:59:11 +02:00
Aeywoo
1211b7f48c Updated website files.
I added a Discord Button and a Discord SVG logo to the main html page of the website, added a new CSS class to make the Discord Button hover on blue instead of being yellow on hover, added a Discord banner to the contribute tab and added a link to our discord server on the bitcoin pop-out and a link to the current GitHub owners reddit user-page.
2022-04-05 17:24:38 +09:30
SkytAsul
315d1e78a3
More accurate french flag area description 2022-04-05 09:44:51 +02:00
ash
4d6fd79368
new submissions, and move to reddit-based ID 2022-04-05 08:39:51 +01:00
Stefano
a736cfd816
Merge pull request #285 from Codixer/contributions/reddit-1
Reddit contributions and improvements to redditcrawl.py
2022-04-05 09:08:14 +02:00
ash
91b2bb82c1
reddit contributions and improvements to redditcrawl.py 2022-04-05 07:58:54 +01:00
Aeywoo
6ef105e45e
Merge pull request #68 from IsseW/patch-1
Add the game veloren
2022-04-05 15:54:26 +09:30
Aeywoo
2690d8493f
Merge branch 'master' into patch-1 2022-04-05 15:53:50 +09:30
Aeywoo
f91d918dcf
Merge pull request #67 from Ratheronfire/master
Adding PlaceTrees/SSBM collab to atlas.
2022-04-05 15:53:12 +09:30
Aeywoo
7a700579c4
Merge branch 'master' into master 2022-04-05 15:52:49 +09:30
Aeywoo
7c004b1f63
Merge pull request #66 from StrikerX3/patch-1
Add Mystery Dungeon entries
2022-04-05 15:52:14 +09:30
Aeywoo
eb47da76c1
Merge branch 'master' into patch-1 2022-04-05 15:51:45 +09:30
Aeywoo
44a33058c3
Merge pull request #65 from mike-w4zowski/patch-1
Add Disco Elisum characters
2022-04-05 15:50:42 +09:30
Aeywoo
f59e07a6fb
Merge branch 'master' into patch-1 2022-04-05 15:50:11 +09:30
Aeywoo
21df19c4c2
Merge pull request #64 from DecentM/decentm/vrcmg
Add VRChat Modding Group icon on the taskbar
2022-04-05 15:49:23 +09:30
Aeywoo
803685c619
Merge branch 'master' into decentm/vrcmg 2022-04-05 15:48:50 +09:30
Aeywoo
a82066d597
Merge pull request #63 from smelv384/patch-1
Add Esperanto
2022-04-05 15:48:10 +09:30
Aeywoo
339b4fd3ba
Merge branch 'master' into patch-1 2022-04-05 15:47:43 +09:30