Merge remote-tracking branch 'origin/master'

.github/ISSUE_TEMPLATE/report-bug.yml

@@ -61,7 +61,7 @@ body:
   - type: textarea
     id: issue-details
     attributes:
-      label: "Issue Detail"
+      label: "Describe Issue"
       description: "A clear and concise description of what the bug is."
       placeholder: "TIP: Always include A log if the issue is causing a crash. These are found in your instance directory under /logs. \nTIP: If applicable, add screenshots to help explain your problem."
     validations:

.github/workflows/issue_label.json5

@@ -14,7 +14,8 @@
   labelsNotAllowed: [
     'duplicate',
     'help wanted',
-    'invalid'
+    'invalid',
+    'information'
   ],
   //defaultLabels: ['bug']
 }

LICENSE.md

@@ -1,16 +1,17 @@
 # Supplementaries Team License
-Version 1.1, July 2024
+Version 1.2, December 2024
 
 Copyright (c) 2024 Supplementaries Team.  All Rights Reserved.
 
-This License Agreement is made between the author(s) of the Software and any person or entity who obtains a copy of this software and/or its associated files.
+This License Agreement is made between the author(s) of the Software and any person or entity who obtains a copy of this Software and/or its associated files.
 
-By using the software, the Licensee agrees to be bound by the terms and conditions of this Agreement.
+By using the Software, the Licensee agrees to be bound by the terms and conditions of this Agreement.
 
 ## 0. Summary
-This license allows nearly all uses for personal purposes, including modification and private sharing from official sources. 
-The license protects authors' rights while maintaining some open-source qualities, such as accepting contributions and allowing code integration in non-competing projects. 
-Public use is permitted with proper credit to the authors. Public redistribution and commercial use are prohibited.
+This license allows nearly all uses for personal purposes, including modification and private sharing from official sources.
+The license protects authors' rights while maintaining some open-source qualities, such as accepting contributions and allowing code integration in non-competing projects.
+Public use is permitted with proper credit to the authors.
+Public redistribution and commercial use are prohibited. 
 
 ## 1. Definitions
 
@@ -19,7 +20,9 @@ For the purposes of this Agreement, the following definitions apply:
 
 - **Our Sources** refers to copies of the Software or its associated files obtained directly from the owners. This includes files available on the owners' official CurseForge or Modrinth project pages.
 
-- **Compete** refers to any project or software offering similar functionality, features, or services as the Software and targeting the same or a similar user base. This includes, but is not limited to, software that directly substitutes or mirrors one or more functionalities of the Software
+- **Compete** refers to any project or software offering similar functionality, features, or services as the Software and targeting the same or a similar user base. This includes, but is not limited to, software that directly substitutes or mirrors one or more functionalities of the Software.
+
+- **Assets** refers to any non-code components of the Software, including but not limited to textures, models, sounds, icons, and other visual or auditory elements.
 
 ## 2. Grant of License
 
@@ -34,6 +37,7 @@ The Software may be copied for private use or to contribute to its development.
 The Licensee may incorporate part of this Software code into their own projects provided that:
 - Appropriate credit is given to the original authors of the Software.
 - The Licensee's project does not "Compete" with the Software.
+- "Assets" are exempt from this clause and require explicit premission
 
 ### 2.3. Modification
 The Software may be modified for private use or to contribute to its development.
@@ -45,7 +49,7 @@ Public distribution or publication of the Software, in whole or in part, is stri
 The Licensee is permitted to share the Software privately with a limited number of individuals, such as friends or family members, provided that:
 
 - The sharing is done without any form of commercial gain or compensation.
-- The Software is not made publicly available or accessible to the general public.
+- The Software, in whole or in part, is not made publicly available or accessible to the general public.
 - The recipients of the Software agree to abide by the terms and conditions of this Agreement.
 
 ### 2.5. Sub-Licensing
@@ -80,4 +84,4 @@ In the event that all authors of the Software were to become unreachable for a p
 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 NON-INFRINGEMENT. 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.
 
 ## 8. Inclusion of Notices
-The above copyright notice and these permission notices must be included in all copies or substantial portions of the Software.
+The above copyright notice and these permission notices must be included in all copies or substantial portions of the Software.

common/src/main/resources/assets/supplementaries/lang/zh_cn.json

@@ -426,6 +426,8 @@
   "message.supplementaries.cage.fail_tamed": "必须先驯服此动物",
   "message.supplementaries.cage.fail_health": "只能捕获生命值低于%s%的动物",
   "message.supplementaries.candle_holder": "可叠放",
+  "message.supplementaries.bunting": "可放置在绳索上",
+  "message.supplementaries.flower_box": "可栽种大型植物",
   "message.supplementaries.cartographers_quill": "未知",
   "message.supplementaries.command.configs": "安装Configured以访问配置",
   "message.supplementaries.command.configs_reloaded": "配置已重载",