Merge branch 'master' into dev

Author: IoeCmcomc

README.md

@@ -1,13 +1,15 @@
+
 ![GitHub](https://img.shields.io/github/license/IoeCmcomc/MCDatapacker)
 ![GitHub repo size](https://img.shields.io/github/repo-size/IoeCmcomc/MCDatapacker)
 ![Lines of code](https://img.shields.io/tokei/lines/github/IoeCmcomc/MCDatapacker)
 [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FIoeCmcomc%2FMCDatapacker&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://hits.seeyoufarm.com)
+![GitHub all releases](https://img.shields.io/github/downloads/IoeCmcomc/MCDatapacker/total)
 
 <br />
 <p align="center">
 <img src="https://raw.githubusercontent.com/IoeCmcomc/MCDatapacker/master/resource/app/icon/favicon_big.png">
   <p align="center">
-    <b>MCDatapacker is a Minecraft datapack editor which supports datapacks for Minecraft 1.15 – 1.17.</b>
+    <b>MCDatapacker is a Minecraft datapack editor which supports datapacks for Minecraft 1.15 – 1.18.2.</b>
   </p>
 </p>
 
@@ -21,30 +23,36 @@ This program can be used for making a new datapack, opening existing datapack, a
 - Multi-tab code editor with syntax highlighting, error checking (mcfunction and JSON), and basic code completion (mcfunction), supports "follow namespaced ID under cursor";
 - Intergrated side editors:
   - A *visual* recipe editor (idea from the [thedestruc7i0n's recipe generator](https://crafting.thedestruc7i0n.ca/ "thedestruc7i0n's recipe generator"));
-  - Predicate, loot table and item modifier editors (idea fron the [misode's generator](https://misode.github.io/ "misode's generator")).
+  - Predicate, loot table and item modifier editors (idea from the [misode's generator](https://misode.github.io/ "misode's generator")).
 - View images (such as the pack.png) directly in the program.
-- Some useful tools, such as displaying datapack statistics and raw JSON text editor.
+- Some useful tools, such as displaying datapack statistics and a raw JSON text editor.
 - Lightweight (in term of storage and memory).
 
 ## Screenshots
 <img src="https://user-images.githubusercontent.com/53734763/120409406-0e1b5c80-c37b-11eb-901f-e74922dc6007.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409410-107db680-c37b-11eb-8c76-bd5c54470798.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409412-11164d00-c37b-11eb-9353-ae9ec47668ad.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409413-11aee380-c37b-11eb-8511-32fe4851955a.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409414-11aee380-c37b-11eb-9976-aa1ad04cf08e.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409415-12e01080-c37b-11eb-8fcb-8277ad220322.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409417-1378a700-c37b-11eb-8b8d-ad4743bcc302.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409420-14113d80-c37b-11eb-9450-0598951233cf.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409421-14a9d400-c37b-11eb-8961-061ea4737fa5.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409423-15426a80-c37b-11eb-9cf9-62e2b95bcb24.png" width="30%"></img> <img src="https://user-images.githubusercontent.com/53734763/120409424-15db0100-c37b-11eb-864a-f9c69e19db96.png" width="30%"></img>  
 
 ## Download
-The program currently supports 1.15, 1.16 and 1.17 data packs, and it only runs on Windows (tested on Windows 7 ~~and Windows 10~~).
+The program currently supports 1.15 - 1.18.2 data packs, and it run on Windows (tested on Windows 7 and Windows 11) and Linux (tested on Ubuntu 20.04.5).
 
-Warning: This is currently an under-development program, which may contain errors. Use it with your own risk.
+Warning: This is currently an under-development program, and may contain errors. Use it with your own risk.
 
 Download link: https://github.com/IoeCmcomc/MCDatapacker/releases/latest
 
+### Windows
 Download the zip file, extract it to a folder and run the *MCDatapacker.exe* file.
 
+### Linux
+Download the .AppImage file, make it executable and run it.
+
 ## Issues
 To report issues, please go to [Issues](https://github.com/IoeCmcomc/MCDatapacker/issues) page. For questions and suggestions, the [Discussion](https://github.com/IoeCmcomc/MCDatapacker/discussions) page is the right place.
 If you don't have a Github account, you can also reply on [this Planet Minecraft page](https://www.planetminecraft.com/mod/program-mcdatapacker-a-datapack-editor/).
 
 ## Disclaimer
-All the Minecraft textures and other materials are copyright © 2009-2022 Mojang Studios.
+Minecraft is a trademark of Mojang Synergies AB.
+
+This program is not affiliated with [Mojang Studios](www.minecraft.net).
 
-Some contents in the program are from Minecraft Wiki (see [Minecraft Wiki:General disclaimer](https://minecraft.gamepedia.com/Minecraft_Wiki:General_disclaimer "Minecraft Wiki:General disclaimer")).
+All Minecraft textures and other materials are copyrighted by Mojang Studios.
 
-This program is not affiliated with Mojang Studios.
+Some content in the program is from [Minecraft Wiki](https://minecraft.fandom.com/wiki/Minecraft_Wiki), whose content (except Mojang-owned images, art, and lore) is licensed under the CC BY-NC-SA 3.0 license.