diff options
| author | nea <nea@nea.moe> | 2023-01-14 21:10:37 +0100 |
|---|---|---|
| committer | nea <nea@nea.moe> | 2023-01-14 21:10:37 +0100 |
| commit | 14f2c9d48a31327a13791dc734813bb2fdb0926e (patch) | |
| tree | 2b608ad4f082aa0d8bedafad98dc7657cdae26c9 /src/main/resources | |
| parent | 84bdb5acf6517fa6ccb4d1ec9cf5eacd40cbc1c1 (diff) | |
| parent | c20f610853702c0208d301865c015ea8ef973fd4 (diff) | |
| download | NotEnoughUpdates-14f2c9d48a31327a13791dc734813bb2fdb0926e.tar.gz NotEnoughUpdates-14f2c9d48a31327a13791dc734813bb2fdb0926e.tar.bz2 NotEnoughUpdates-14f2c9d48a31327a13791dc734813bb2fdb0926e.zip | |
Merge remote-tracking branch 'origin/master' into museumthing
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png | bin | 3370 -> 3752 bytes | |||
| -rw-r--r-- | src/main/resources/assets/notenoughupdates/search_mode_button.png | bin | 0 -> 644 bytes | |||
| -rw-r--r-- | src/main/resources/mixins.notenoughupdates.json | 4 | ||||
| -rw-r--r-- | src/main/resources/neukeystore.jks | bin | 101958 -> 104393 bytes | |||
| -rw-r--r-- | src/main/resources/neukeystore.txt | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png b/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png Binary files differindex b08c0057..7ea7af0e 100644 --- a/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png +++ b/src/main/resources/assets/notenoughupdates/pv_crimson_isle_page.png diff --git a/src/main/resources/assets/notenoughupdates/search_mode_button.png b/src/main/resources/assets/notenoughupdates/search_mode_button.png Binary files differnew file mode 100644 index 00000000..416d26f7 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/search_mode_button.png diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index 028a9e65..d080d7f5 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -54,6 +54,8 @@ "AccessorMinecraft", "MixinEntityChargedCreeper", "MixinGuiEditSign", - "MixinGuiTextField" + "MixinGuiTextField", + "MixinThreadDownloadImageData", + "MixinThreadDownloadImageDataThread" ] } diff --git a/src/main/resources/neukeystore.jks b/src/main/resources/neukeystore.jks Binary files differindex 3a5a23b6..b71185af 100644 --- a/src/main/resources/neukeystore.jks +++ b/src/main/resources/neukeystore.jks diff --git a/src/main/resources/neukeystore.txt b/src/main/resources/neukeystore.txt index 5616f69b..a64accd0 100644 --- a/src/main/resources/neukeystore.txt +++ b/src/main/resources/neukeystore.txt @@ -13,5 +13,7 @@ Please keep a list of added aliases below: - ISRGROOTX1 (Let's Encrypt) - ISRGROOTX2 (Let's Encrypt) + - MSRSAROOT (Microsoft Root CA 2017) + - DIGIROOTG2 (DigiCert Global Root G2) |
