Commit Graph

6 Commits

Author SHA1 Message Date
Sebastian-byte
dd5a930739 Fix conflict 2021-10-24 17:15:27 -05:00
Jamie Mansfield
7cbca6ab20 NOISSUE Use common duration format for global and instances 2021-10-24 00:09:21 +01:00
Sebastian
297d982ddd Merge branch 'MultiMC:develop' into develop 2021-09-24 16:25:17 -05:00
Petr Mrázek
0f3cf0595b NOISSUE add shader pack page for instances
Only theme with an icon is simple colored, rest is TBD
2021-09-23 21:26:56 +02:00
Sebastian-byte
65d3068e9f Fix conflict 2021-07-25 18:34:28 -05:00
Petr Mrázek
20b9f2b42a NOISSUE Flatten gui and logic libraries into MultiMC 2021-07-25 19:50:44 +02:00