MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2024-11-14 14:02:40 +01:00
Code Issues Projects Releases Wiki Activity
4431 commits 3 branches 0 tags 1.7 GiB
Commit graph

547 commits

Author SHA1 Message Date
mxdanger
48e471585f Update view.js 2022-04-21 10:56:50 -07:00
mxdanger
5823e27f67 Various additions/fixes 
* Added wiki link to navbar
* Updated info block card header to be body color instead of link color
* Updated logo with no padding
* Updated logo to switch based on media query
* Fixed entries list to be hidden when drawing
* Fixed -webkit-backdrop-filter supports media query
 2022-04-21 00:25:05 -07:00
mxdanger
c55d3b8b24 Major UI redesign 2022-04-20 01:54:58 -07:00
Hans5958
74b8073a7b Do stricter (and proper) subreddit regex 2 
I forgot that I made it so it excludes underscore, here's a proper fix
 2022-04-19 16:42:20 +07:00
Hans5958
1bca3bb9c5 Do stricter (and proper) subreddit regex 
3-21 instead of 1-20
 2022-04-19 16:34:52 +07:00
Hans5958
2f417e433a Optimize new center algo a little bit 
incl. Don't use modules
 2022-04-17 14:12:34 +07:00
Hans5958
91465afda1 Fix bugs of new center algorithm to make it work 2022-04-17 13:51:59 +07:00
Fabian Wunsch
c01610774d
Merge branch 'remaster' into new-center-algorithm 2022-04-17 08:31:51 +02:00
Hans5958
49a0c85c27 Fix pattern to compensate R/ on links object 2022-04-17 13:18:43 +07:00
Hans5958
80af47e5c1 Forgot to include Discord and wiki on export, small refactor 
Also better regex from formatter
 2022-04-17 13:08:30 +07:00
Hans5958
3833b208ea Do not draw is no path is defined when drawing 2022-04-17 12:37:31 +07:00
Hans5958
67998c479e Try to fix tooltip positioning 2022-04-17 12:27:53 +07:00
Hans5958
adcdc56a81 Avoid aborted errors 2022-04-17 09:53:43 +07:00
Hans5958
19b695734c Fetch layers in parallel instead of in series 2022-04-16 23:58:13 +07:00
Hans5958
264175811d Fix timestamp to be more accurate 2022-04-16 23:47:18 +07:00
Hans5958
44454490a7 30-minute r/place canvas 
Images courtesy of Scaevolus#7213
Add extra images of the canvas, final from prod is now used
 2022-04-16 23:06:42 +07:00
Hans5958
004f1157f9 The Final Clean canvases 2022-04-16 22:53:04 +07:00
Hans5958
bb27a82550 Attempt to fix inaccurate background updating 2022-04-16 22:26:37 +07:00
Hans5958
684f70270a Remove function that I somehow used but not defined 2022-04-16 22:26:37 +07:00
Hans5958
7fd620088c Fix blank pixel calculation 2022-04-16 22:26:37 +07:00
Hans5958
a384577050 Remove console logs, use info and error console logs 2022-04-16 22:26:37 +07:00
Hans5958
14151b639d Fix errors when nothing returned on updateCategory 2022-04-16 22:26:37 +07:00
Hans5958
2e728ef20f Fix no-var problems (ESLint), run formatter on JS 2022-04-16 22:26:37 +07:00
Hans5958
4be8a36839 Fix prefer-const problems (ESLint) 2022-04-16 22:26:37 +07:00
Hans5958
ca80770793 Add copying paths to other period groups 2022-04-16 22:26:37 +07:00
Hans5958
18edfdd867 Fix switching variations on draw mode fails 2022-04-16 22:26:37 +07:00
Hans5958
35bedfac34 Fix bug when period capping on 100 
Co-authored-by: Fabian Wunsch <42294590+fabi321@users.noreply.github.com>
 2022-04-16 22:26:37 +07:00
Hans5958
1afbd77b82 Layer based loading, use separate object for cache, deprecate timeConfig 2022-04-16 22:26:37 +07:00
Hans5958
bfb9764200 Match position when only 1 can be selected on slider 
Co-authored-by: Fabian Wunsch <fabian@uriah.heep.sax.de>
 2022-04-16 22:26:37 +07:00
Hans5958
f2671f2e9b Merge branch 'upstream/cleanup' into edit 2022-04-16 22:26:37 +07:00
Hans5958
12efb7608f Comment out console logs 2022-04-16 22:25:11 +07:00
Hans5958
d676dff31a Editing on canvas variations done, rename vars for clarity 2022-04-16 22:25:11 +07:00
Hans5958
81ba896e73 Viewing on canvas variations done 2022-04-16 22:25:11 +07:00
Hans5958
4648401a38 Put multiple periods in different groups, fix diff 
Multiple periods part is untested
 2022-04-16 22:25:11 +07:00
Hans5958
e11ba73337 Fix reappearing atlas outlines on explore 2022-04-16 22:25:11 +07:00
Hans5958
bbcf813bde Discord and Reddit fields, bug fix on drawing new entries, auto-resize text area 2022-04-16 22:25:11 +07:00
Hans5958
cdc4e4458c Implement links object, convert old format to new on init 
Co-authored-by: Fabian Wunsch <fabian@uriah.heep.sax.de>
Co-authored-by: mxdanger <32040254+mxdanger@users.noreply.github.com>
 2022-04-16 22:25:11 +07:00
Hans5958
9df8c3dd8a Update time when atlas loaded 
Co-authored-by: Fabian Wunsch <fabian@uriah.heep.sax.de>
 2022-04-16 22:25:11 +07:00
Hans5958
34fcec8aa3 Fix bugs from Fabi 
Co-authored-by: Fabian Wunsch <fabian@uriah.heep.sax.de>
 2022-04-16 22:25:11 +07:00
Hans5958
347d2f9dff Improvements on validator 
Should now detect conflicts/overlaps and insufficient paths
 2022-04-16 22:25:11 +07:00
Hans5958
ab00863b73 Make exporting and view work 2022-04-16 22:25:11 +07:00
Hans5958
14f1ec4afa Fix broken undo button 
Reporter below

Co-authored-by: Fabian Wunsch <fabian@uriah.heep.sax.de>
 2022-04-16 22:25:11 +07:00
Hans5958
a13b9b2a3a Bring back time changing when changing start/stop, improve disable drawing 2022-04-16 22:25:11 +07:00
Hans5958
ee9edb8031 Further improvements 2022-04-16 22:25:11 +07:00
Hans5958
9639c9ee4f Make base work for new entries 2022-04-16 22:25:11 +07:00
Hans5958
a6868219fd Implement base of period groups 2022-04-16 22:25:11 +07:00
Hans5958
225d44b146 Use URLSearchParams, keep using search params for edit id 2022-04-16 22:25:11 +07:00
Hans5958
e8fc67f91d Add style on highlight checkbox, sync period to be edited 2022-04-16 22:25:11 +07:00
Hans5958
1070a5aa65 Add support for overlap, remove debug logs 2022-04-16 22:25:11 +07:00
Hans5958
2d20e0931d Add entry periods 2022-04-16 22:25:11 +07:00
Hans5958
dd5e809e4f Support editing, return to previous step instead of resetting 2022-04-16 22:25:10 +07:00
Hans5958
84a8e4c141 Tiny refactor, do not wait until fetch for updating tooltip 2022-04-14 21:05:45 +07:00
Hans5958
0a1d5c01ee Forgot to fix resize fix 
Please no Netlify gimmicko again
 2022-04-14 21:05:45 +07:00
Hans5958
0744836aa6 setTimeout instead of setInterval 2022-04-14 21:05:45 +07:00
Hans5958
904fee390b Improve canvas loading 
A
 2022-04-14 21:05:45 +07:00
Fabian Wunsch
3476089dcb Removed debug output 2022-04-12 17:32:30 +02:00
Fabian Wunsch
aa227a612e Included tinyqueue 2022-04-12 17:31:35 +02:00
Fabian Wunsch
1e52cdaa95 Added algorithm customizations 2022-04-12 17:29:40 +02:00
Fabian Wunsch
53a92f29c3 First actually somewhat working js version 2022-04-12 16:56:34 +02:00
Fabian Wunsch
4ae1bab064 final import fix 2022-04-12 16:45:07 +02:00
Fabian Wunsch
def634aec8 Several import fixes 2022-04-12 16:21:14 +02:00
Fabian Wunsch
8bf6b23524 Firs try at getting the original polylabel.js to work 2022-04-12 16:08:47 +02:00
Hans5958
104e003b74 Fixing the ghost shifting, once and for all 
Resolves #1232
 2022-04-11 20:44:58 +07:00
Wayland-Smithy
64f957eab6 Do not forget about overlap 2022-04-11 19:52:07 +07:00
Wayland-Smithy
f00f68a17a Hash (tag) takeover 2022-04-11 19:52:07 +07:00
Wayland-Smithy
e86d3f4258 Use hash for id highlight 2022-04-11 19:52:07 +07:00
AnonymousRandomPerson
e0728154ad Merge branch 'master' into cleanup 2022-04-10 14:13:14 -04:00
Stefano
2008edd35a
Merge branch 'master' into timeline-tooltip 2022-04-10 12:23:11 +02:00
Stefano
4306b49ff0
Merge branch 'master' into logo 2022-04-10 11:44:04 +02:00
Hans5958
b1d87f1e30 Add tooltip on timeline 2022-04-10 14:03:08 +07:00
mxdanger
c4cc72faad Updated logos, favicon, and metadata 2022-04-09 23:32:42 -07:00
Stefano
fa8c58164f
Merge pull request #1158 from fabi321/update-center 
Update center of entries
 2022-04-09 22:49:17 +02:00
Fabian Wunsch
93dc57d618 Small bugfix in js 2022-04-09 21:22:56 +02:00
Fabian Wunsch
bf834a6565 Cleaned up calculateCenter function 
While I still don't understand what it's doing exactly, I noticed that
the 2 iterations of the loop are unnecessary, and afterwards found out
that the change to area is equal to f. Furthermore I replaced the `~~`
flooring with Math.floor for better readability, since this function
get's executed once per submission and the speed benefits of `~~` are
neglectable.
 2022-04-09 21:04:08 +02:00
Hans5958
2dadfdb255
Port 63ed091 
I forgor
 2022-04-09 22:49:27 +07:00
Hans5958
4ce2afb60b Console logs haven't been removed?! 2022-04-09 17:24:30 +07:00
Hans5958
a870d33cf8 Refactor to avoid code duplicates 2022-04-09 16:33:10 +07:00
Hans5958
331e7bdb5a Use arguments on one log 
You can use arguments on console log and you can access the error like normal
 2022-04-09 16:33:10 +07:00
Hans5958
f6b89ac7c1 Remove redundant here and link "our Discord server" instead 2022-04-09 16:33:10 +07:00
Hans5958
7b2e9af945 Improve Donation window 2022-04-09 16:33:10 +07:00
Hans5958
0dad9761dc Use commas instead of x for coords 
Since the coords shown on top left is in comma
 2022-04-09 16:33:10 +07:00
Hans5958
98e60fc14b Avoid creating duplicates on diff mode 
So we don't have more than 2x as much of entries on this mode
 2022-04-09 16:33:10 +07:00
Hans5958
d7861baff3 Finally make explore mode work, small refactor 
Oh man, these element structures were quite inefficient...
 2022-04-09 16:33:10 +07:00
Hans5958
ae4ca99262 Redirect error reports to Discord 2022-04-09 16:33:10 +07:00
Hans5958
804159e116 Reduce copyright notice, add 2022 contributors, add missing notice 
The lengthy boilerplate is unnecessary, especially since it is already linked. The type of license can stay there instead.
 2022-04-09 16:33:10 +07:00
Hans5958
a19ee7d65a Use HTTPS link to license 2022-04-09 16:33:09 +07:00
Hans5958
b20ebed52d Fix prod domain 2022-04-09 16:33:09 +07:00
Hans5958
7c1fcf06e3 Hide diff on prod domain 2022-04-09 16:33:09 +07:00
Hans5958
2723f9ed17 Convert it into dropdown 2022-04-09 16:33:09 +07:00
Stefano
bb5db95158
Merge branch 'master' into diffdel 2022-04-08 23:37:02 +02:00
Stefano
d47d95e93b
Merge branch 'master' into feature/passive_scroll 2022-04-08 23:34:13 +02:00
unknown
68f5f8b5e5 Improved diffview 2022-04-08 17:12:39 -03:00
unknown
f5b84f2331 Collapsable coordinate box 2022-04-08 14:39:10 -03:00
unknown
be7e1ec28d Coord box 2022-04-08 13:39:41 -03:00
Stefano Haagman
2f84c98e60 Lighthouse 2022-04-08 16:13:50 +02:00
Stefano Haagman
307557882f woops 2022-04-08 15:59:37 +02:00
Stefano Haagman
15624c9db2 test 2022-04-08 15:56:22 +02:00
Nicolas Abram
7454571151
Merge branch 'master' into diff 2022-04-08 03:06:47 -03:00
unknown
9bc14f4453 Make time.js urls relative 2022-04-08 01:47:59 -03:00
Wayland-Smithy
b0b1215d7f Add diff modes 2022-04-07 21:06:16 -07:00
AnonymousRandomPerson
eabfb4263c Allowed searching by subreddit 2022-04-07 21:53:33 -04:00
Alex Tsernoh
880399eb8c
disable atlas on not latest image 2022-04-08 00:11:29 +01:00
Alex Tsernoh
77887164ee
add final image to timeline 2022-04-07 23:06:24 +01:00
Alex Tsernoh
57ac93c817
Merge branch 'master' into time-travel 2022-04-07 22:35:27 +01:00
Wayland-Smithy
5cc49d2fc8 Change hover display to list small areas first 2022-04-07 14:09:41 -07:00
Alex Tsernoh
5d374d37c1
Merge branch 'master' into area-feature 2022-04-07 19:10:07 +01:00
Alex Tsernoh
55a68ff89a
add images every 6 hours 2022-04-07 16:53:23 +01:00
Alex Tsernoh
34bb67665c
actual code for time travel 2022-04-07 16:51:46 +01:00
Stefano
1d26ddb9c7
Merge branch 'master' into feature/donations 2022-04-06 22:16:27 -07:00
Stefano Haagman
0168ac9b83 Donation lins 2022-04-07 07:14:55 +02:00
Tonny2442
d42fc06d23 removed todo 2022-04-06 20:26:29 -04:00
Tonny2442
b1237d3bae rudimentary area cache 2022-04-06 20:26:28 -04:00
Tonny2442
31b83c6a1b addressed PR comment 2022-04-06 20:26:28 -04:00
Tonny2442
67c91eada1 add sort by area (largest to smallest) 2022-04-06 20:26:28 -04:00
Trevor Sayre
47cac036c6 Add smooth pixel zooming 2022-04-06 17:14:59 -04:00
Stefano
7bf513234f
Merge branch 'master' into master 2022-04-06 08:48:55 -07:00
ash
4493f85e0c
reddit contributions 2022-04-06 16:34:36 +01:00
ash
ccddefa72c
reddit contributions 2022-04-06 16:34:04 +01:00
ash
6ab4fc48b4
reddit contributions 2022-04-06 16:32:51 +01:00
asivery
9a177b814d Added the ability to selectively override images, removed old, commented-out code from atlas.js, added more info into the info block (position, area). 2022-04-06 15:34:51 +02:00
imskyyc
c24791ac43
Update main.js 2022-04-06 01:30:04 -07:00
Someone Somewhere
0163f8593b
Merge branch 'master' into add_2022 2022-04-05 23:07:19 +03:00
Stefano
50603f7be4
Merge branch 'master' into fix_url_id_param 2022-04-05 21:52:52 +02:00
Stefano Haagman
8a403e4709 Merge branch 'cleanup' 2022-04-05 21:51:35 +02:00
Stefano Haagman
b6406b9c33 Added overlap mode. 2022-04-05 21:26:54 +02:00
n9iels
ced71c9c92 Fix click propagnation on mobile 2022-04-05 19:29:38 +02:00
Malte Jürgens
cb98d20121
Fix URL id param 2022-04-05 18:09:47 +02:00
Malte Jürgens
f5b490124e
Change name to "The 2022 /r/place Atlas" 2022-04-05 17:53:01 +02:00
ash
6206596da1
fix and update crawler 2022-04-05 13:47:36 +01:00
ash
1f2d35b802
remove references to PR submission 2022-04-05 13:20:06 +01:00
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
asivery
4bfd98f1be Fix path in async request 2022-04-05 11:53:26 +02:00
asivery
399dfad357 JSON, IDs migration 2022-04-05 11:48:15 +02:00
enshael
2823419d2d
Merge branch 'master' into master 2022-04-05 17:14:51 +08:00
Aeywoo
f5bbfb70f1
Merge branch 'master' into contributions/reddit-1 2022-04-05 18:43:19 +09:30
enshael
bf58535ca5 convert to new id format 2022-04-05 17:13:15 +08:00
Someone Somewhere
0b83952e7c
Merge branch 'master' into patch-1 2022-04-05 12:12:05 +03:00
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
c6cb146970
Merge branch 'master' into patch-1 2022-04-05 11:55:21 +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
7cfb298a5d
Merge branch 'master' into patch-1 2022-04-05 11:50:20 +03:00
Someone Somewhere
ee5df9ace6
Merge branch 'master' into patch-1 2022-04-05 11:48:16 +03:00
Someone Somewhere
c555a44797
Merge branch 'master' into patch-2 2022-04-05 11:43:43 +03:00
Someone Somewhere
084c81caa7
Merge branch 'master' into patch-3 2022-04-05 11:36:55 +03:00
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
42a0c6c619
Merge branch 'master' into master 2022-04-05 11:33:08 +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
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
ash
91b2bb82c1
reddit contributions and improvements to redditcrawl.py 2022-04-05 07:58:54 +01:00
Aeywoo
2690d8493f
Merge branch 'master' into patch-1 2022-04-05 15:53:50 +09:30
Aeywoo
7a700579c4
Merge branch 'master' into master 2022-04-05 15:52:49 +09:30
Aeywoo
eb47da76c1
Merge branch 'master' into patch-1 2022-04-05 15:51:45 +09:30
Aeywoo
f59e07a6fb
Merge branch 'master' into patch-1 2022-04-05 15:50:11 +09:30
Aeywoo
803685c619
Merge branch 'master' into decentm/vrcmg 2022-04-05 15:48:50 +09:30
Aeywoo
339b4fd3ba
Merge branch 'master' into patch-1 2022-04-05 15:47:43 +09:30
Aeywoo
7e1de1824a
Merge branch 'master' into patch-1 2022-04-05 15:44:13 +09:30
Aeywoo
99ecdc9b29
Merge branch 'master' into patch-1 2022-04-05 15:42:51 +09:30
Aeywoo
5ba479241e
Merge branch 'master' into decentm/vrchat 2022-04-05 15:41:43 +09:30
Aeywoo
498b6d1945
Merge branch 'master' into patch-1 2022-04-05 15:40:18 +09:30
Aeywoo
b1000c83e5
Merge branch 'master' into patch-1 2022-04-05 15:34:10 +09:30
Aeywoo
f927287375
Merge branch 'master' into master 2022-04-05 15:31:50 +09:30
Aeywoo
cda334478b
Merge branch 'master' into master 2022-04-05 14:58:57 +09:30
Aeywoo
b1cc4c2ac4
Merge branch 'master' into master 2022-04-05 14:53:01 +09:30
Aeywoo
bda1630ba5
Merge branch 'master' into patch-1 2022-04-05 14:46:59 +09:30
ShadowForests
12de95feeb
Fix Kaf website link 
This updates the Kaf website link to point to the correct location
 2022-04-04 22:15:17 -07:00
Aeywoo
8bbff58c11
Merge branch 'master' into patch-1 2022-04-05 14:41:05 +09:30
ShadowForests
3fb4b7063e
Fix Kaf outline 
This fixes the Kaf outline to properly surround the area to include one missing 1-pixel layer of the outline
 2022-04-04 22:07:48 -07:00
Aeywoo
1722c6588e
Merge branch 'master' into patch-2 2022-04-05 14:31:31 +09:30
Aeywoo
b4f6665ce3
Merge branch 'master' into patch-1 2022-04-05 14:30:29 +09:30
Aeywoo
23432707b7
Merge branch 'master' into patch-1 2022-04-05 14:29:23 +09:30
Aeywoo
303ad6bd81
Updated atlas.js 
Please do not place any value higher than 0 above the first entry of atlas.js.
 2022-04-05 14:27:19 +09:30
Aeywoo
eca1545c71
Merge branch 'master' into patch-1 2022-04-05 14:25:25 +09:30
Aeywoo
2ea6ff712e
Merge branch 'master' into master 2022-04-05 14:24:20 +09:30
Aeywoo
557c1e20e8
Merge branch 'master' into patch-2 2022-04-05 14:21:49 +09:30
Aeywoo
a9b88e3a3a
Updated atlas.js 
Replaced an extra right curly bracket (}) with a regular right bracket (]).
 2022-04-05 14:19:56 +09:30
Aeywoo
c6047b4450
Merge branch 'master' into patch-1 2022-04-05 14:17:38 +09:30
Aeywoo
c8870c9e20
Merge branch 'master' into patch-1 2022-04-05 14:15:27 +09:30
enshael
776c47c658 Update Abby's Entry 2022-04-05 12:44:27 +08:00
Aeywoo
5940bf5417
Updated atlas.js 
Removed extra right bracket (]) causing an Invalid destructuring assignment target.
 2022-04-05 14:12:59 +09:30
enshael
2bda6762e9 Add more related entries 2022-04-05 12:39:58 +08:00
Aeywoo
f8a6d89a18
Merge branch 'master' into patch-1 2022-04-05 14:07:17 +09:30
Aeywoo
34be1510cc
Merge branch 'master' into patch-1 2022-04-05 14:05:17 +09:30
Aeywoo
7711096b05
Merge branch 'master' into patch-1 2022-04-05 14:02:13 +09:30
Aeywoo
22fcd7d956
Updated atlas.js 
Added missing comma.
 2022-04-05 13:59:35 +09:30
Aeywoo
1cf913fe88
Merge branch 'master' into master 2022-04-05 13:58:25 +09:30
Aeywoo
3f8f61504b
Merge branch 'master' into patch-1 2022-04-05 13:55:00 +09:30
Aeywoo
f11617a832
Merge branch 'master' into master 2022-04-05 13:53:11 +09:30
Aeywoo
e37f06fa6f
Merge branch 'master' into master 2022-04-05 13:51:24 +09:30
Aeywoo
6567910652
Merge branch 'master' into patch-1 2022-04-05 13:49:06 +09:30