Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

AbstractionMC · Jul 3, 2024 · 765a12b · 765a12b
2 parents 118b934 + 91af617
commit 765a12b
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
@@ -1,10 +1,25 @@
-Multiple Licenses
+# License (Multiple Licenses)
 
-Code: MIT License (Primarily Files ending with .java/.gradle)
-Models/Textures: ARR by @Shaun1p
+## All Rights Reserved (ARR)
 
-Below the license for "Code":
+The following files are subject to "All Rights Reserved" (ARR) and may not be distributed, copied, modified, or used without explicit permission from the author:
 
+- `scr/main/generated`
+- `scr/main/resources/assets`
+- `scr/main/resources/data`
+
+### License:
+```
+Copyright (c) 2024 Shaun1p/Shaunt1p
+All Rights Reserved
+```
+
+## MIT License
+
+All other files in this repository are licensed under the MIT License. See the full text of the MIT License below:
+
+### License:
+```
 MIT License
 
 Copyright (c) 2024 AbstractionMC
@@ -26,3 +41,4 @@ 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.
+```