yupp

EwyBoy · Jun 11, 2021 · 6f04d86 · 6f04d86
1 parent b49aa7e
commit 6f04d86
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,16 +3,16 @@
 Ore-Tweaker is open-source distributed under the [MIT-License](https://github.com/EwyBoy/OreTweaker/blob/master/LICENSE.md).
 
 I encourage you to contribute your ideas, code and problems you may experience while using Ore-Tweaker.  
-There are several ways for you to contribute to the Ore-Tweaker project.  
-  
+There are several ways for you to contribute to the Ore-Tweaker project.
+
 If you want to contribute have a look at the [Project Table](https://github.com/EwyBoy/OreTweaker/projects/1?fullscreen=true) and look for the `Help Wanted` tag.
 
-* Contribute by shearing your ideas as feature requests [here](https://github.com/EwyBoy/OreTweaker/issues/new?assignees=EwyBoy&labels=Compatibility+Request&template=compatibility-request.md&title=%5BCompatibility%5D+MOD-NAME).
+* Contribute by sharing your ideas as feature requests [here](https://github.com/EwyBoy/OreTweaker/issues/new?assignees=EwyBoy&labels=Compatibility+Request&template=compatibility-request.md&title=%5BCompatibility%5D+MOD-NAME).
 * Contribute by reporting any issues or bugs you may encounter [here](https://github.com/EwyBoy/OreTweaker/issues/new?assignees=EwyBoy&labels=bug&template=bug_report.md&title=%5BBug%5D+Relevant+title+here)
 * Contribute by proposing compatibility between Ore-Tweaker and any other mods [here](https://github.com/EwyBoy/OreTweaker/issues/new?assignees=EwyBoy&labels=Compatibility+Request&template=compatibility-request.md&title=%5BCompatibility%5D+MOD-NAME)
 * Contribute by developing for Ore-Tweaker by making a pull-request [here](https://github.com/EwyBoy/OreTweaker/pulls)
 
 All help is very much appreciated.  
 For more info ask in my Discord [here](https://discord.gg/eAsSV8dXX2).
-  
+
 -Ewy
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 <h1 align="center">Ore Tweaker
 	<br>
+<<<<<<< Updated upstream
 		<a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker/files">
 		    <img src="https://img.shields.io/badge/Supported%20Versions-MC%201.16-00c756?style=for-the-badge" alt="Available Versions"></a>
 		<a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker/files">
@@ -15,6 +16,20 @@
 		<a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker">
 		    <img src="https://cf.way2muchnoise.eu/full_242436_downloads.svg" alt="Curseforge Downloads">
 		</a>
+=======
+        <a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker/files">
+            <img src="https://img.shields.io/badge/Supported%20Versions-MC%201.16-00c756?style=for-the-badge" alt="Available Versions"></a>
+        <a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker/files">
+            <img src="https://img.shields.io/badge/Available%20for-MC%201.7,%201.8,%201.9,%201.10,%201.11,%201.12,%201.16-c70039?style=for-the-badge" alt="Available Versions"></a>
+        <a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker/files">
+            <img src="https://img.shields.io/badge/Available%20for-FORGE-0669ba?style=for-the-badge" alt="Modloader Versions"></a>
+        <a href="https://github.com/EwyBoy/OreTweaker/blob/master/LICENSE.txt">
+            <img src="https://img.shields.io/github/license/EwyBoy/OreTweaker?style=for-the-badge&color=900c3f" alt="License"></a>
+        <a href="https://discord.gg/eAsSV8dXX2">
+            <img src="https://img.shields.io/discord/305535757441826817?color=5261f8&label=Discord&logoColor=1d3367&style=for-the-badge" alt="Discord"></a>
+        <a href="https://www.curseforge.com/minecraft/mc-mods/ore-tweaker">
+            <img src="https://cf.way2muchnoise.eu/full_242436_downloads.svg" alt="Curseforge Downloads"></a><br>
+>>>>>>> Stashed changes
     <br>
 </h1>
 

diff --git a/build.gradle b/build.gradle
@@ -91,6 +91,8 @@ jar {
     }
 }
 
+jar.finalizedBy('reobfJar')
+
 curseforge {
     if (project.hasProperty('CF_API_KEY')){
         apiKey = project.getProperty('CF_API_KEY')
@@ -108,6 +110,4 @@ curseforge {
             displayName = "${MODNAME}-${MC_VERSION}-${VERSION}.jar"
         }
     }
-}
-
-jar.finalizedBy('reobfJar')
+}
diff --git a/gradle.properties b/gradle.properties
@@ -14,9 +14,8 @@ FORGE_VERSION=36.1.25
 # Mappings
 
 MCP_CHANNEL=official
-MCP_MAPPINGS=1.16.5
-
 # MCP_CHANNEL=snapshot
+MCP_MAPPINGS=1.16.5
 # MCP_MAPPINGS=20210309-1.16.5
 
 # Curse Maven