Commit graph

443 commits

Author SHA1 Message Date
geese_suck
e260b1ca54 marsey the cat 2022-04-05 19:20:44 -04:00
opsodps
8131c3e714
resolved conflicting commit issue 2022-04-05 16:14:05 -07:00
mchristo38
505ee9e16b Merge branch 'cleanup' of https://github.com/mchristo38/place-atlas into cleanup 2022-04-06 01:13:01 +02:00
linkcool200
646614c7d1
Fixing OnlyNekos description and link. 2022-04-05 19:11:17 -04:00
ash
f2149b9a57
Merge pull request #575 from atomicmoloch/cleanup
Cleanup
2022-04-06 00:11:13 +01:00
atomicmoloch
2484d57278 Merge branch 'cleanup' of https://github.com/atomicmoloch/place-atlas into cleanup 2022-04-05 23:01:32 -07:00
atomicmoloch
483da2271f Fixed borders around bound baby
Note: I fixed the borders last commit but forgot to include a description
2022-04-05 22:55:25 -07:00
atomicmoloch
81f882040b Update atlas.json 2022-04-05 22:50:45 -07:00
mchristo38
d726dffba3 Update atlas.json
Changed the Name and Description of the Hinata Bird
2022-04-06 01:10:59 +02:00
ash
7c6e37d4c9
Merge pull request #577 from Kyrtaax/cleanup
Remove errant characters
2022-04-06 00:10:17 +01:00
cooltrain7
1d0f577185 Fix TheBlueCorner
Fix the description and position for TheBlueCorner for the current place image.
2022-04-06 00:08:45 +01:00
ash
5f7ebb5a5e
Merge pull request #574 from jacobmacleod/cleanup
Change subreddit name associated with Autistic Pride Flag
2022-04-06 00:02:10 +01:00
ash
ebc021a1d6
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 23:59:55 +01:00
ash
0e875cbec5
new submissions 2022-04-05 23:59:21 +01:00
Mystery
b9cd9dbdd2 Fix a bracket 2022-04-06 00:54:41 +02:00
ash
fb318c322b
Merge pull request #570 from glassgypsum/cleanup
Worth the Candle - description grammar correction - twp52y
2022-04-05 23:54:31 +01:00
Kyrtaax
cccbda2235
Remove errant characters
Removing "nn" from the description. This was caused by a linebreak in the original input
2022-04-05 23:52:56 +01:00
Jacob MacLeod
61895c8d2d
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 18:52:37 -04:00
ash
5b0ff31938
Merge pull request #566 from Tonny2442/cleanup
Fix OMORI desc, dupes
2022-04-05 23:50:25 +01:00
Stefano Haagman
d0a3dd0453 Merge branch 'cleanup' 2022-04-06 00:46:01 +02:00
Jacob MacLeod
00d40b8834 Change subreddit associated with Autistic Pride Flag 2022-04-05 18:45:59 -04:00
glassgypsum
477b07a39b Update atlas.json 2022-04-05 18:45:26 -04:00
Tonny2442
8b9622e14c Fix OMORI desc, dupes 2022-04-05 18:42:30 -04:00
ash
41134149c4
Merge pull request #563 from nico-abram/rust
Fix rust cog newline and remove duplicate
2022-04-05 23:40:06 +01:00
unknown
972d8bf7db Fix rust cog newline and remove duplicate 2022-04-05 19:38:22 -03:00
ash
50a9317362
Merge pull request #557 from man6168/cleanup
fixed typos and edited descriptions for r/eightysix artworks.
2022-04-05 23:36:55 +01:00
ash
66c7734201
Merge pull request #555 from Malsententia/cleanup
fix: updated berrytube with detailed description
2022-04-05 23:35:59 +01:00
ash
40a7e4a796
Merge pull request #554 from Hoi15A/cleanup
Replace tx2sjr with a correct entry
2022-04-05 23:35:50 +01:00
Mystery
5b1655b84f Update atlas.json 2022-04-06 00:35:08 +02:00
ash
046fe20cca
Merge branch 'master' into reddit 2022-04-05 23:34:21 +01:00
Stefano Haagman
2d840fc36b Merge branch 'cleanup' 2022-04-06 00:33:13 +02:00
ash
3c3860fdff
Merge pull request #550 from ThePizzaMuncher/cleanup
Indie Bench redundancy removal
2022-04-05 23:32:51 +01:00
ash
b232aa579a
Merge pull request #549 from AnonymousRandomPerson/cleanup-quackity
Remove Quackity dupes
2022-04-05 23:32:23 +01:00
ash
4c2bf6c185
Merge pull request #547 from AnonymousRandomPerson/cleanup-hayase
Updated Hayase Nagotoro description
2022-04-05 23:32:09 +01:00
ash
9836112ddc
Merge branch 'master' into reddit 2022-04-05 23:29:16 +01:00
man6168
3d1c63990d
fixed typos and edited descriptions for r/eightysix artworks.
fixed typos and edited descriptions for r/eightysix artworks. Included collaboration information with allies in r/place.
2022-04-05 18:28:22 -04:00
ash
0eb0575fcc
new submissions 2022-04-05 23:27:25 +01:00
Malsententia
c217d12ce7 fix: updated berrytube with detailed description 2022-04-05 15:23:45 -07:00
Austin Albrecht
a102f63697
Replace tx2sjr with a correct entry 2022-04-06 00:23:24 +02:00
Stefano Haagman
d6b6df8d80 Merge branch 'cleanup' 2022-04-06 00:22:28 +02:00
ash
868d07d9a2
patch 2022-04-05 23:15:02 +01:00
ash
d5235f4830
Merge pull request #545 from AnonymousRandomPerson/cleanup-nanachi
Updated Nanachi
2022-04-05 23:10:55 +01:00
ash
1a3299a6fb
Merge pull request #544 from AnonymousRandomPerson/cleanup-cascadia
Fixed Cascadia flag
2022-04-05 23:10:47 +01:00
ash
8e26107b96
Merge pull request #543 from AnonymousRandomPerson/cleanup-forestkingemperor
Removed duplicate forest king emperor
2022-04-05 23:10:35 +01:00
ash
075d49b9b6
Merge pull request #542 from AnonymousRandomPerson/cleaup-shark3ozero
Fixed link for Shark3ozero
2022-04-05 23:10:25 +01:00
ash
7c4d7164d0
Merge pull request #541 from AnonymousRandomPerson/cleanup-dnf
Removed DNF dupes
2022-04-05 23:10:16 +01:00
ash
60ae358539
Merge pull request #540 from JopStro/cleanup
Merge CubeKrowd Duplicates
2022-04-05 23:10:04 +01:00
ash
33ef6f7274
Merge pull request #539 from mystery2me/cleanup
Pathing edit so selection lines don't interfere with artwork, misc. edits.
2022-04-05 23:09:47 +01:00
ash
d3d14ab42a
Merge pull request #536 from AnonymousRandomPerson/cleanup-eighty-six
Removed duplicate Eighty Six entries
2022-04-05 23:09:14 +01:00
ash
337ef6bfe8
Merge pull request #532 from AnonymousRandomPerson/cleanup-menorah
Updated temple menorah
2022-04-05 23:08:40 +01:00
ash
465267fae3
Merge pull request #531 from EnragedRabisu/shibbysays-spiral
Update an Entry's size and path to point to the spiral
2022-04-05 23:08:07 +01:00
AnonymousRandomPerson
467a7003bd Remove Quackity dupes 2022-04-05 18:03:31 -04:00
ash
605c3417ea
Merge pull request #528 from DubyaDude/cleanup
Edit border for VRChat Modding Group
2022-04-05 23:02:30 +01:00
AnonymousRandomPerson
f6fd243943 Updated Hayase Nagatoro 2022-04-05 17:56:17 -04:00
ThePizzaMuncher
63e568fbd1 Changed the boundaries of the chosen “Indie Bench” area entry; removed redundant “Indie Bench” entries 2022-04-05 23:55:25 +02:00
ash
96e2919979
Merge pull request #537 from memmam/cleanup
Fix phosphor hearts in MrRobot alliance
2022-04-05 22:54:16 +01:00
Mystery
8c30ee2c89 Fix pathing. 2022-04-05 23:53:31 +02:00
ash
29bf524c7c
Merge pull request #529 from Nivek770/german_branch_duplicates_2
Merged SO MANY Duplicates on the german Flag
2022-04-05 22:51:55 +01:00
AnonymousRandomPerson
fd386137a0 Updated Nanachi 2022-04-05 17:51:48 -04:00
Mystery
e39892fe2b Revert "Add files via upload"
This reverts commit fba8715398.
2022-04-05 23:51:19 +02:00
AnonymousRandomPerson
21b6b79e9c Fixed Cascadia flag 2022-04-05 17:49:53 -04:00
AnonymousRandomPerson
7d98077d96 Removed duplicate forest king emperor 2022-04-05 17:44:48 -04:00
AnonymousRandomPerson
ddb22a5162 Fixed link for Shark3ozero 2022-04-05 17:42:01 -04:00
AnonymousRandomPerson
4ac29f09f1 Removed DNF dupes 2022-04-05 17:39:43 -04:00
Mystery
fba8715398
Add files via upload 2022-04-05 23:34:58 +02:00
JopStro
c6e811e43a Merge CubeKrowd Duplicates 2022-04-05 22:34:13 +01:00
Ellie M
777fb66bd4
JSON fix 2022-04-05 14:30:31 -07:00
Ellie M
f60e3ed1ce
Fix phosphor hearts in MrRobot alliance 2022-04-05 14:28:09 -07:00
AnonymousRandomPerson
e1cf55b892 Removed duplicate Eighty Six entries 2022-04-05 17:25:17 -04:00
AnonymousRandomPerson
408a97d1fe Updated temple menorah 2022-04-05 17:19:30 -04:00
EnragedRabisu
7f806c73b3 Update coords to point to the spiral 2022-04-05 16:56:19 -04:00
Kevin Hasse
5413a6cd4b Merged SO MANY Duplicates on the german Flag 2022-04-05 22:45:12 +02:00
Usman Shafiq
e6e3eceb8a
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 16:44:51 -04:00
Usman Shafiq
ecb90a2517 Edit border for VRCMG 2022-04-05 16:44:29 -04:00
JopStro
4f41e59ee2 Fix typo in their 2022-04-05 21:38:01 +01:00
Stefano Haagman
a820417402 Merge branch 'cleanup' 2022-04-05 22:22:43 +02:00
Stefano
f47355f020
Merge pull request #520 from Nivek770/german_flag
German Flag Duplicated
2022-04-05 22:21:17 +02:00
ash
67cbb44f84
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 21:19:46 +01:00
ash
a762d96132
patch 2022-04-05 21:19:36 +01:00
Stefano
64d0b77bb2
Merge pull request #521 from recordcrash/cleanup
John Egbert fix on branch cleanup
2022-04-05 22:19:36 +02:00
Stefano Haagman
d603a7891b Merge branch 'cleanup_loser' into cleanup 2022-04-05 22:17:47 +02:00
Makin
8c2436cd91 Added John Egbert fix to cleanup branch 2022-04-05 22:17:35 +02:00
Kevin Hasse
cbdb091d19 Merged most of the duplicates on the german flag
(cherry picked from commit 97f28d7951)
2022-04-05 22:12:51 +02:00
Someone Somewhere
4ce9b1dcb4
Merge pull request #517 from nico-abram/veloren
Fix veloren coordinates
2022-04-05 23:12:37 +03:00
Makin
498c368010 Readded missing John Egbert entry 2022-04-05 22:09:50 +02:00
unknown
d1683b0f55 Fix veloren coordinates 2022-04-05 17:06:47 -03:00
Stefano Haagman
b6f16499b9 Merge remote-tracking branch 'origin/cleanup' into cleanup 2022-04-05 22:05:08 +02:00
Someone Somewhere
760406b4f8
Merge pull request #516 from Wayland-Smithy/cleanup-df
Remove duplicate Dwarf Fortress entry
2022-04-05 23:04:56 +03:00
Stefano Haagman
70df5779e9 Merge branch 'contributions/reddit' into cleanup 2022-04-05 22:04:54 +02:00
Wayland-Smithy
83e7edf534 Remove duplicate 2022-04-05 12:59:37 -07:00
ash
1eb81da6de
reddit contributions 2022-04-05 20:57:08 +01:00
ash
726751135c
Merge pull request #512 from SchneckchenAndy/cleanup
Cleanup Clustertruck submission and remove duplicate
2022-04-05 20:55:01 +01:00
ash
d2cae072d5
Merge pull request #510 from DubyaDude/cleanup
Edit VRChat Logo Description (Grammer mistake)
2022-04-05 20:54:49 +01:00
ash
63388f67a7
Merge pull request #509 from neinwhal/cleanup
Fix entry for r/singapore (id: 133)
2022-04-05 20:54:30 +01:00
ash
d22ddd6e9b
Merge pull request #508 from memmam/cleanup
Vernba fix
2022-04-05 20:54:04 +01:00
ash
eb357bf678
Merge pull request #506 from ForsenPlace/cleanup
Fixed and improved Peppah's entry
2022-04-05 20:53:46 +01:00
ash
42a7f58fa9
Merge pull request #513 from JopStro/cleanup
Fix typo in word development
2022-04-05 20:52:29 +01:00
Stefano Haagman
8a403e4709 Merge branch 'cleanup' 2022-04-05 21:51:35 +02:00
JopStro
eaea6327e2 Fix typo in word development 2022-04-05 20:49:34 +01:00
Andreas
4ed1db6e33
Merge branch 'Codixer:cleanup' into cleanup 2022-04-05 21:49:17 +02:00
ash
0a04a543fc
math 2022-04-05 20:48:35 +01:00
SchneckchenAndy
5e01dfce4a
Cleanup Clustertruck submission and remove duplicate 2022-04-05 21:48:25 +02:00
ash
06f4bbef4c
quackity 2022-04-05 20:47:14 +01:00
ash
b1448864bb
scp 2022-04-05 20:46:20 +01:00
ash
4a31b36411
benchy 2022-04-05 20:45:15 +01:00
ash
73aeb5b77c
uk 2022-04-05 20:44:21 +01:00
ash
de806e56d1
homestuck 2022-04-05 20:42:47 +01:00
ash
5715773769
dbz 2022-04-05 20:42:14 +01:00
ash
0ac7121157
mlp 2022-04-05 20:41:36 +01:00
ash
b2ca1838fb
titanfolk 2022-04-05 20:41:10 +01:00
ash
86bff24ab6
f1 2022-04-05 20:40:29 +01:00
ash
7500217793
uc 2022-04-05 20:40:06 +01:00
ash
bb0fdbdcdb
scrapmechanic 2022-04-05 20:38:53 +01:00
ash
5063f84b1a
elchatese 2022-04-05 20:38:29 +01:00
ash
2dede62d80
murica 2022-04-05 20:37:00 +01:00
ash
49396a8122
placepride 2022-04-05 20:34:17 +01:00
ash
aa6466cbb0
tf2 2022-04-05 20:33:34 +01:00
ash
2e0abdd011
Merge branch 'cleanup' of github.com:Codixer/place-atlas into cleanup 2022-04-05 20:32:08 +01:00
ash
5698f8210b
beljum 2022-04-05 20:32:03 +01:00
Stefano Haagman
4dcb9f6683 Merge branch 'updates' into cleanup 2022-04-05 21:31:47 +02:00
ash
bb35857d06
jesus fucking christ france 2022-04-05 20:30:28 +01:00
Usman Shafiq
2bab4ac352 Edit VRChat Logo Description (Grammer mistake) 2022-04-05 15:29:39 -04:00
Stefano Haagman
4779d8fb53 Merge branch 'cleanup_tupper' into cleanup 2022-04-05 21:29:00 +02:00
ash
c44868c815
FRANCE 2022-04-05 20:28:03 +01:00
neinwhal
c518e09599 Edit r/singapore 2022-04-06 03:26:58 +08:00
Stefano Haagman
b6406b9c33 Added overlap mode. 2022-04-05 21:26:54 +02:00
Ellie M
4a2da1eac9
Vernba fix 2022-04-05 12:26:04 -07:00
ash
77c5a3724d
cleanup 2022-04-05 20:25:39 +01:00
ash
87b66e5157
Matsumoto 2022-04-05 20:25:00 +01:00
ash
7372141525
ralsei my beloved 2022-04-05 20:23:39 +01:00
ash
ad881402b2
teardown 2022-04-05 20:23:10 +01:00
ash
8c8484f012
pulsus 2022-04-05 20:22:53 +01:00
ash
a98fc7ce9f
pulsus 2022-04-05 20:22:28 +01:00
ash
1f5998b711
finland arms 2022-04-05 20:21:54 +01:00
ash
d41790fe5a
legion413 2022-04-05 20:21:37 +01:00
ash
9409e22878
david 2022-04-05 20:21:07 +01:00
ash
88e67796a8
sistine chapel 2022-04-05 20:20:45 +01:00
ash
e50edae3ce
philipine 2022-04-05 20:20:13 +01:00
ForsenPlace
e615e2af07 Improved and expanded description, removed wrong statements, fixed misattribution and corrected typos 2022-04-05 21:19:26 +02:00
ash
087a67132e
seven provinces 2022-04-05 20:19:09 +01:00
ash
ff84ac5409
rainbowdash 2022-04-05 20:18:09 +01:00
ash
1aad1c3071
amongo 2022-04-05 20:17:43 +01:00
ash
264df8b67f
madoka 2022-04-05 20:17:10 +01:00
ash
ca677e2a10
night watch 2022-04-05 20:16:45 +01:00
ash
34592fefb7
shapez 2022-04-05 20:15:31 +01:00
ash
2301a7d610
mlp 2022-04-05 20:15:04 +01:00
ash
c57886191e
vtlatam 2022-04-05 20:14:04 +01:00
ash
3aa6ffc1b8
bleach 2022-04-05 20:13:12 +01:00
ash
144560a707
Merge pull request #498 from howardt12345/taiwan-edit-links
Edit: Taiwan links and info
2022-04-05 20:05:37 +01:00
ash
f1e044e542
Merge pull request #497 from luisxmz/cleanup
Panama artwork description (Edit)
2022-04-05 20:05:21 +01:00