Skip to content

Commit 7ceb761

Browse files
committed
Merge remote-tracking branch 'origin/MC-1.14.4' into MC-1.15.2
# Conflicts: # build.gradle # changelog.md # gradle.properties # readme.md # src/main/kotlin/com/mairwunnx/projectessentials/backup/EntryPoint.kt # src/main/resources/META-INF/mods.toml # update.json
2 parents fb6804d + 014dce0 commit 7ceb761

File tree

30 files changed

+752
-691
lines changed

30 files changed

+752
-691
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 Core version: [e.g. v1.0.0.0]
26-
> - Project Essentials version: [e.g. v0.6.0.0]
27-
> - Project Essentials Modules version: [e.g. Spawn - v1.0.0.2; Home - v1.3.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: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
## Pull Request template
2-
Please, go through these steps before you submit a PR.
1+
## Description
32

4-
1. Make sure that your PR is not a duplicate.
5-
2. If not, then make sure that:
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.
64

7-
a. You have done your changes in a separate branch. Branches MUST have descriptive names that start with either the `fix/` or `feature/` prefixes. Good examples are: `fix/signin-issue` or `feature/issue-templates`.
5+
Fixes # (issue)
86

9-
b. You have a descriptive commit message with a short title (first line).
7+
# How Has This Been Tested?
108

11-
c. You have only one commit (if not, squash them into one commit).
9+
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
1210

13-
3. **After** these steps, you're ready to open a pull request.
11+
- [ ] Test A
12+
- [ ] Test B
1413

15-
a. Your pull request MUST NOT target the `master` branch on this repository. You probably want to target `staging` instead.
14+
# Checklist:
1615

17-
b. Give a descriptive title to your PR.
18-
19-
c. Provide a description of your changes.
20-
21-
d. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if such).
22-
23-
**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**
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: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,11 @@ forge*changelog.txt
4949
hs_err_pid*
5050

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

5554
# Ignore Gradle GUI config
5655
gradle-app.setting
5756

58-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
59-
!gradle-wrapper.jar
60-
6157
# Cache of project
6258
.gradletasknamecache
6359

@@ -69,15 +65,6 @@ gradle-app.setting
6965

7066
# End of https://www.gitignore.io/api/gradle
7167

72-
# Ignore Gradle GUI config
73-
gradle-app.setting
74-
75-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
76-
!gradle-wrapper.jar
77-
78-
# Cache of project
79-
.gradletasknamecache
80-
8168
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
8269
# gradle/wrapper/gradle-wrapper.properties
8370

@@ -125,9 +112,6 @@ cmake-build-*/
125112
# Mongo Explorer plugin
126113
.idea/**/mongoSettings.xml
127114

128-
# File-based project format
129-
*.iws
130-
131115
# IntelliJ
132116
out/
133117
run/
@@ -165,3 +149,4 @@ fabric.properties
165149

166150
# Sonarlint plugin
167151
.idea/sonarlint
152+
!/gradle/wrapper/gradle-wrapper.jar

LICENSE

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

assets/backup_social.png

-58.6 KB
Binary file not shown.

assets/backup_social.xd

-143 KB
Binary file not shown.

0 commit comments

Comments
 (0)