diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-06-08 14:56:32 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-06-08 14:58:29 +0800 |
| commit | 3b1e371aca065a69d4469e497917485ec096123c (patch) | |
| tree | 8c6879a6005194d0afb9deef15a781a5903664aa | |
| parent | a5c727c6f21d8c6dcedd51b0f66f209027580375 (diff) | |
| parent | 8e30d26beb4672fd69bbd5d7f44e2114265abd0c (diff) | |
| download | RoughlyEnoughItems-3b1e371aca065a69d4469e497917485ec096123c.tar.gz RoughlyEnoughItems-3b1e371aca065a69d4469e497917485ec096123c.tar.bz2 RoughlyEnoughItems-3b1e371aca065a69d4469e497917485ec096123c.zip | |
Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
# Conflicts:
# fabric/src/main/resources/error_notifier.json
| -rw-r--r-- | fabric/src/main/resources/error_notifier.json | 6 | ||||
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/impl/client/CodepointMapWrapper.java | 23 |
2 files changed, 26 insertions, 3 deletions
diff --git a/fabric/src/main/resources/error_notifier.json b/fabric/src/main/resources/error_notifier.json index 2049592bc..62ceb1414 100644 --- a/fabric/src/main/resources/error_notifier.json +++ b/fabric/src/main/resources/error_notifier.json @@ -6,21 +6,21 @@ "modId": "fabric", "modName": "Fabric API", "versions": "*", - "url": "https://www.curseforge.com/minecraft/mc-mods/fabric-api/files/all/" + "url": "https://www.curseforge.com/minecraft/mc-mods/fabric-api/" }, { "type": "depends", "modId": "architectury", "modName": "Architectury API", "versions": ">=9.0.7 <10.0.0", - "url": "https://www.curseforge.com/minecraft/mc-mods/architectury-api/files/all" + "url": "https://www.curseforge.com/minecraft/mc-mods/architectury-api/" }, { "type": "depends", "modId": "cloth-config2", "modName": "Cloth Config", "versions": ">=11.0.0 <12.0.0", - "url": "https://www.curseforge.com/minecraft/mc-mods/cloth-config/files/all" + "url": "https://www.curseforge.com/minecraft/mc-mods/cloth-config/" } ] }
\ No newline at end of file diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/CodepointMapWrapper.java b/forge/src/main/java/me/shedaniel/rei/impl/client/CodepointMapWrapper.java index 2362d48da..fcc396b9c 100644 --- a/forge/src/main/java/me/shedaniel/rei/impl/client/CodepointMapWrapper.java +++ b/forge/src/main/java/me/shedaniel/rei/impl/client/CodepointMapWrapper.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.impl.client; import it.unimi.dsi.fastutil.ints.IntSet; |
