Skip to content

Commit c14b6cc

Browse files
committed
Merge remote-tracking branch 'origin/MC-1.14.X' into MC-1.15.2
# Conflicts: # build.gradle # changelog.md # gradle.properties # readme.md # src/main/kotlin/com/mairwunnx/projectessentials/permissions/EntryPoint.kt # src/main/kotlin/com/mairwunnx/projectessentials/permissions/commands/PermissionsCommand.kt # src/main/kotlin/com/mairwunnx/projectessentials/permissions/permissions/PermissionBase.kt # src/main/kotlin/com/mairwunnx/projectessentials/permissions/permissions/PermissionModel.kt # src/main/resources/META-INF/mods.toml # src/main/resources/assets/projectessentialspermissions/lang/zh_cn.json # src/main/resources/pack.mcmeta # update.json
2 parents 485c666 + 6129971 commit c14b6cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2272
-1943
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
44
patreon: # Replace with a single Patreon username
55
open_collective: # Replace with a single Open Collective username
6-
ko_fi: mairwunnx # Replace with a single Ko-fi username
6+
ko_fi: # Replace with a single Ko-fi username
77
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
88
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
99
liberapay: # Replace with a single Liberapay username
1010
issuehunt: # Replace with a single IssueHunt username
1111
otechie: # Replace with a single Otechie username
12-
custom: 'https://money.yandex.ru/to/410015993365458' # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
12+
custom: ['https://money.yandex.ru/to/410015993365458', 'https://paypal.me/mairwunnx'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,16 @@ assignees: ''
77

88
---
99

10-
### Describe the bug
11-
> - A clear and concise description of what the bug is.
10+
### Description of the problem
1211

13-
### Steps to reproduce the behavior
14-
> - 1. Go to '...'
15-
> - 2. Enter command '....'
16-
> - 3. See error
12+
### Steps to reproduce this problem
1713

1814
### Expected behavior
19-
> - A clear and concise description of what you expected to happen.
2015

21-
### Screenshots
22-
> - If applicable, add screenshots to help explain your problem.
16+
### Additional materials
2317

2418
### Environment information
25-
> - Project Essentials Permissions version: [e.g. v0.5.0.0]
26-
> - Project Essentials Core version: [e.g. v0.3.0.0]
27-
> - Project Essentials Modules version: [e.g. Spawn - v1.0.0.0; Home - v1.0.0.0]
28-
> - Minecraft / Forge version: [e.g. 1.14.4 / 28.1.0]
2919

30-
### Additional context
31-
> - Add any other context about the problem here.
20+
### Your comment.
3221

3322
### Log files. (latest.log and debug.log file in attachment)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
Closes #
2-
Addresses #
1+
## Description
32

4-
#### What is included in this PR?
3+
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
54

6-
<!-- Answer any that apply and delete the others. -->
7-
#### What new issues will need to be opened because of this PR?
5+
Fixes # (issue)
86

9-
#### What is left to be done in the addressed issue?
7+
# How Has This Been Tested?
108

11-
#### What problems did you encounter?
9+
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
10+
11+
- [ ] Test A
12+
- [ ] Test B
13+
14+
# Checklist:
15+
16+
- [ ] My code follows the style guidelines of this project
17+
- [ ] I have performed a self-review of my own code
18+
- [ ] I have commented my code, particularly in hard-to-understand areas
19+
- [ ] I have made corresponding changes to the documentation
20+
- [ ] My changes generate no new warnings
21+
- [ ] Any dependent changes have been merged and published in downstream modules

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ forge*changelog.txt
4949
hs_err_pid*
5050

5151
### Gradle ###
52-
.gradle
5352
build/
5453

5554
# Ignore Gradle GUI config
@@ -66,12 +65,6 @@ gradle-app.setting
6665

6766
# End of https://www.gitignore.io/api/gradle
6867

69-
# Ignore Gradle GUI config
70-
gradle-app.setting
71-
72-
# Cache of project
73-
.gradletasknamecache
74-
7568
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
7669
# gradle/wrapper/gradle-wrapper.properties
7770

@@ -119,9 +112,6 @@ cmake-build-*/
119112
# Mongo Explorer plugin
120113
.idea/**/mongoSettings.xml
121114

122-
# File-based project format
123-
*.iws
124-
125115
# IntelliJ
126116
out/
127117
run/

LICENSE

Lines changed: 0 additions & 165 deletions
This file was deleted.

assets/permissions_social_logo.jpg

-437 KB
Binary file not shown.

assets/permissions_social_logo.xd

-4.83 MB
Binary file not shown.

assets/support_social.png

-74 KB
Binary file not shown.

assets/support_social.svg

Lines changed: 0 additions & 34 deletions
This file was deleted.

assets/support_social.xd

-162 KB
Binary file not shown.

0 commit comments

Comments
 (0)