Skip to content

Commit a924843

Browse files
authored
Merge pull request #227 from PolyhedralDev/ver/6.0.0
Major Version 6.0 Tracking PR
2 parents e445fd9 + b4cdb7f commit a924843

File tree

1,502 files changed

+39684
-37174
lines changed

Some content is hidden

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

1,502 files changed

+39684
-37174
lines changed

.editorconfig

Lines changed: 350 additions & 103 deletions
Large diffs are not rendered by default.

.github/ISSUE_TEMPLATE/BUG_REPORT.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ assignees: ""
3737
-->
3838

3939
- [ ] I have checked that I am on the latest version of Terra.
40-
- [ ] I have searched the github issue tracker for similar issues, including closed ones.
41-
- [ ] I have made sure that this is not a bug with another mod or plugin, and it is Terra that is causing the issue.
42-
- [ ] I have checked that this is an issue with Terra and not an issue with the pack I am using.
40+
- [ ] I have searched the github issue tracker for similar issues, including
41+
closed ones.
42+
- [ ] I have made sure that this is not a bug with another mod or plugin, and it
43+
is Terra that is causing the issue.
44+
- [ ] I have checked that this is an issue with Terra and not an issue with the
45+
pack I am using.
4346
<!-- If this is an issue with the default Terra pack, please open an issue on the pack repo: https://github.com/PolyhedralDev/TerraDefaultConfig/issues/new -->
4447
- [ ] I have attached a copy of the `latest.log` file
4548
- [ ] I have filled out and provided all the appropriate information.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ assignees: ""
3131
-->
3232

3333
- [ ] I have checked that I am on the latest version of Terra.
34-
- [ ] I have searched github for similar features requests, including closed ones, and found none.
34+
- [ ] I have searched github for similar features requests, including closed
35+
ones, and found none.
3536
- [ ] I believe this is within the scope of Terra.
36-
- [ ] This feature request is for *all* of Terra, and isn't something that should be implemented by a pack or addon.
37+
- [ ] This feature request is for *all* of Terra, and isn't something that
38+
should be implemented by a pack or addon.
3739

3840
## Feature Description
3941

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
22
name: "Other Issue"
3-
about: "Use this template if your issue doesn't accurately fit into any of the other categories."
3+
about: "Use this template if your issue doesn't accurately fit into any of the
4+
other categories."
45
title: ""
56
labels: "Type: Question, Status: Pending"
67
assignees: ""
78

89
---
910

1011
## Describe the issue
12+
1113
<!-- Please describe the issue as clearly and as concisely as possible, without missing any details. -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Which Issue Template do I Choose?
4-
url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
3+
- name: Which Issue Template do I Choose?
4+
url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
55
about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you.
6-
- name: Terra Wiki
7-
url: https://github.com/PolyhedralDev/Terra/wiki
6+
- name: Terra Wiki
7+
url: https://github.com/PolyhedralDev/Terra/wiki
88
about: Documentation for all things Terra.
9-
- name: Join the Support Discord
10-
url: https://discord.dfsek.com
9+
- name: Join the Support Discord
10+
url: https://discord.dfsek.com
1111
about: If you have a basic support question, join the Discord instead.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333

3434
<!-- In order to be accepted, your changes must be under the GPLv3 license. Please check one of the following: -->
3535

36-
- [ ] I am the original author of this code, and I am willing to release it under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
37-
- [ ] I am not the original author of this code, but it is in public domain or released
38-
under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a compatible license.
36+
- [ ] I am the original author of this code, and I am willing to release it
37+
under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
38+
- [ ] I am not the original author of this code, but it is in public domain or
39+
released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a
40+
compatible license.
3941
<!--
4042
Please provide reliable evidence of this.
4143
NOTE: for compatible licenses, you must make sure to add the included license somewhere in the program, if so required.
@@ -70,19 +72,24 @@
7072

7173
- [ ] Bug Fix <!-- Anything which fixes an issue in Terra. -->
7274
- [ ] Build system <!-- Anything which pretain to the build system. -->
73-
- [ ] Documentation <!-- Anything which adds or improves documentation for existing features. -->
75+
- [ ]
76+
Documentation <!-- Anything which adds or improves documentation for existing features. -->
7477
- [ ] New Feature <!-- Anything which adds new functionality to Terra. -->
7578
- [ ] Performance <!-- Anything which is imrpoves the performance of Terra. -->
76-
- [ ] Refactoring <!-- Anything which does not add any new code, only moves code around. -->
77-
- [ ] Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
79+
- [ ]
80+
Refactoring <!-- Anything which does not add any new code, only moves code around. -->
81+
- [ ]
82+
Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
7883
- [ ] Revert <!-- Anything which reverts previous commits. -->
7984
- [ ] Style <!-- Anything which updates style. -->
8085
- [ ] Tests <!-- Anything which adds or updates tests. -->
81-
- [ ] Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
86+
- [ ]
87+
Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
8288

8389
#### Compatiblity
8490

85-
- [ ] Breaking change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
91+
- [ ] Breaking
92+
change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
8693
- [ ] Non-Breaking change.
8794
<!--
8895
A change which does not break *any* previous functionality of Terra.
@@ -94,8 +101,9 @@
94101

95102
#### Contribution Guidelines.
96103

97-
- [ ] I have read the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md) document in the root of the
98-
git repository.
104+
- [ ] I have read
105+
the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
106+
document in the root of the git repository.
99107
- [ ] My code follows the code style for this
100108
project. <!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
101109

.github/workflows/build.yml

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

.gitignore

Lines changed: 116 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ hs_err_pid*
6565
.idea/**/dictionaries
6666
.idea/**/shelf
6767

68+
.idea/
69+
6870
# Generated files
6971
.idea/**/contentModel.xml
7072

@@ -127,17 +129,120 @@ fabric.properties
127129
# Android studio 3.1+ serialized cache file
128130
.idea/caches/build_file_checksums.ser
129131

130-
# Ignore Gradle build output directory
131-
build
132-
/target/
133-
134-
.idea/sonarlint/**
135-
.idea/codeStyles/**
136-
.idea/**.xml
137-
.idea/modules/**.iml
132+
### Windows template
133+
# Windows thumbnail cache files
134+
Thumbs.db
135+
Thumbs.db:encryptable
136+
ehthumbs.db
137+
ehthumbs_vista.db
138+
139+
# Dump file
140+
*.stackdump
141+
142+
# Folder config file
143+
[Dd]esktop.ini
144+
145+
# Recycle Bin used on file shares
146+
$RECYCLE.BIN/
147+
148+
# Windows Installer files
149+
*.cab
150+
*.msi
151+
*.msix
152+
*.msm
153+
*.msp
154+
155+
# Windows shortcuts
156+
*.lnk
157+
158+
### macOS template
159+
# General
160+
.DS_Store
161+
.AppleDouble
162+
.LSOverride
163+
164+
# Icon must end with two \r
165+
Icon
166+
167+
# Thumbnails
168+
._*
169+
170+
# Files that might appear in the root of a volume
171+
.DocumentRevisions-V100
172+
.fseventsd
173+
.Spotlight-V100
174+
.TemporaryItems
175+
.Trashes
176+
.VolumeIcon.icns
177+
.com.apple.timemachine.donotpresent
178+
179+
# Directories potentially created on remote AFP share
180+
.AppleDB
181+
.AppleDesktop
182+
Network Trash Folder
183+
Temporary Items
184+
.apdisk
185+
186+
### Linux template
187+
*~
188+
189+
# temporary files which can be created if a process still has a handle open of a deleted file
190+
.fuse_hidden*
191+
192+
# KDE directory preferences
193+
.directory
194+
195+
# Linux trash folder which might appear on any partition or disk
196+
.Trash-*
197+
198+
# .nfs files are created when an open file is removed but is still being accessed
199+
.nfs*
200+
201+
### Application
202+
# Archive love files
203+
*.log.gz
204+
205+
# binary files
206+
*.bin
207+
208+
# Database files
209+
*.db
210+
211+
# Cache files
212+
*.meta
213+
*.data
214+
215+
### JEnv template
216+
# JEnv local Java version configuration file
217+
.java-version
218+
219+
# Used by previous versions of JEnv
220+
.jenv-version
221+
222+
### VisualStudioCode template
223+
.vscode/*
224+
!.vscode/settings.json
225+
!.vscode/tasks.json
226+
!.vscode/launch.json
227+
!.vscode/extensions.json
228+
*.code-workspace
229+
230+
# Local History for Visual Studio Code
231+
.history/
232+
233+
### NetBeans template
234+
**/nbproject/private/
235+
**/nbproject/Makefile-*.mk
236+
**/nbproject/Package-*.bash
237+
build/
238+
nbbuild/
239+
dist/
240+
nbdist/
241+
.nb-gradle/
242+
243+
###
244+
**/target/
138245

139-
!lib/*.jar
140246
/run/
141-
idea/**
142247

143-
testDir/
248+
**/testDir/

0 commit comments

Comments
 (0)