Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
139001b
Fixed it. upgrade to V1.0.5
bartimaeusnek Jan 26, 2018
739a4eb
Small Gui Fix
bartimaeusnek Jan 30, 2018
b13e29f
Update README.MD
bartimaeusnek Jan 30, 2018
d4e9d70
+added gradlew automation
bartimaeusnek Feb 12, 2018
0f08557
Merge pull request #1 from bartimaeusnek/GT-NH-Mod
bartimaeusnek Feb 12, 2018
ab8d9f9
Added gradle wrapper jar
bartimaeusnek Feb 12, 2018
30d2405
added gradlew wrapper jar
bartimaeusnek Feb 12, 2018
64b269e
Create README_CH_DIMS.MD
bartimaeusnek Feb 28, 2018
849edc2
Rename README_CH_DIMS.MD to README_ZH-CN_DIMS.MD
bartimaeusnek Feb 28, 2018
b0e5b65
added Sheetexport feature
bartimaeusnek Apr 24, 2018
060ec74
Various Fixes
bartimaeusnek Apr 24, 2018
0864ce3
version bump
bartimaeusnek Apr 24, 2018
0be290d
name fix for csv export
bartimaeusnek Apr 25, 2018
2ced6af
Merge pull request #2 from bartimaeusnek/GT-NH-Mod
Dream-Master Apr 26, 2018
83f6f8f
hotfix for NoClassDefFoundError
bartimaeusnek Apr 30, 2018
c44f90d
Merge pull request #3 from bartimaeusnek/GT-NH-Mod
Dream-Master Apr 30, 2018
e2c8a04
Crashfix 2.0
bartimaeusnek May 3, 2018
c4ad105
Merge pull request #4 from bartimaeusnek/GT-NH-Mod
bartimaeusnek May 3, 2018
b68623b
New jenkins source
Namikon May 3, 2018
a0bfd77
1.0.7
bartimaeusnek Mar 27, 2019
3d7fafb
Merge branch 'GT-NH-Mod' into GTNH-Mod-SmallOres
bartimaeusnek Mar 27, 2019
2f41352
Merge pull request #5 from bartimaeusnek/GTNH-Mod-SmallOres
Dream-Master Mar 27, 2019
63e659f
add Tier Planets
aagrishankov Nov 22, 2020
d1f29e2
Merge pull request #6 from 4gname/patch-1
Dream-Master Nov 22, 2020
7265ed8
fix(NEiPlugin)update Gt build version
Dream-Master Nov 23, 2020
6cf2ebb
bump version
Dream-Master Dec 20, 2020
66d8c20
bump gt build dependencies
Dream-Master Dec 20, 2020
27a4e86
add lang key about dimension and fix a localization issue
iouter Jul 19, 2021
c8206f5
fix Deep Dark
iouter Jul 19, 2021
0fbf2ad
add "Vanilla EndAsteroids" and delete vein names in zh_CN
iouter Jul 20, 2021
a68e861
αCentauriBb
iouter Jul 20, 2021
cfcc6c4
Merge pull request #7 from iouter/GT-NH-Mod
Dream-Master Jul 30, 2021
7246239
update(GT-NEI)Gradle
Dream-Master Jul 30, 2021
b9243f0
reduce code duplication
iouter Jul 31, 2021
98e65bf
Merge pull request #8 from iouter/GT-NH-Mod
D-Cysteine Jul 31, 2021
61bc530
update(GT-NEI)version
Dream-Master Jul 31, 2021
3913b3c
Merge branch 'GT-NH-Mod' of https://github.com/GTNewHorizons/GTNEIOre…
Dream-Master Jul 31, 2021
240a5e4
Synchronize ore vein names to visual prospecting if installed
Oct 29, 2021
84f934f
Merge pull request #9 from GTNewHorizons/lang-file-integration
Dream-Master Oct 30, 2021
f426951
bump gt dependencie
Dream-Master Oct 30, 2021
9b2272b
Update license (#11)
mitchej123 Dec 5, 2021
b4f5e02
update dependencies (#12)
bombcar Dec 6, 2021
c88ea3b
Draft for unified build script (#10)
Dec 19, 2021
9f4ea5d
Tooltip rework (#13)
YannickMG Dec 23, 2021
d53a56a
Updated build script and pinned dependencies
YannickMG Jan 22, 2022
b0655be
Replacing access transformers by reflection
YannickMG Jan 22, 2022
a371b64
Enaable publishing to Maven repository
YannickMG Jan 22, 2022
606d944
update to explicit dependencies and gtnh buildscript
mitchej123 Jan 22, 2022
07f048a
rollback buildscript 1 version, add deps
mitchej123 Jan 22, 2022
793693e
more deps
mitchej123 Jan 22, 2022
7156325
update for maven (#16)
bombcar Mar 4, 2022
1cb11f4
ignore bat files
Dream-Master Mar 4, 2022
7836eea
Enhanced NEI discoverability (#17)
YannickMG Jul 6, 2022
5c06d00
Add Dimension Display Item (#18)
miozune Jul 9, 2022
1e423d3
Rework for Dimension Display (#19)
miozune Jul 12, 2022
8d107e3
[ci skip] Migrate github actions to GTNH-Actions-Workflows
mitchej123 Jul 16, 2022
4eeee86
Underground fluid NEI (#20)
miozune Aug 2, 2022
d2363df
Add Drilling Rig IV to RecipeCatalyst (#21)
miozune Aug 24, 2022
5eaf79f
Update zh_CN.lang (#22)
Kiwi233 Sep 24, 2022
7523a23
Update build.gradle
Dream-Master Nov 5, 2022
9c2b103
Update textures by Jimbno (#23)
miozune Nov 5, 2022
1d38214
Helper hashmaps for black hole gen
GTNH-Colen Dec 17, 2022
c1c476b
Remove debug statement
GTNH-Colen Dec 17, 2022
9396914
Fix issues
GTNH-Colen Dec 17, 2022
cc48e25
Fix issues
GTNH-Colen Dec 17, 2022
f3fe84c
Revert "Fix issues"
GTNH-Colen Dec 17, 2022
1ba92ee
Revert "Fix issues"
GTNH-Colen Dec 17, 2022
1bc7a4b
Revert "Remove debug statement"
GTNH-Colen Dec 17, 2022
457c977
Revert "Helper hashmaps for black hole gen"
GTNH-Colen Dec 17, 2022
7cdbdb7
Helper hashmaps for black hole gen (#24)
Connor-Colenso Dec 17, 2022
a9edfd8
Change access modifier. (#27)
Connor-Colenso Dec 17, 2022
b1d0a92
Fix if statement not triggering code correctly and slight clarificati…
Connor-Colenso Dec 17, 2022
3f1f37d
More helpers for other mods (#29)
Connor-Colenso Dec 21, 2022
90d2ab4
Make DD offiically tier 9 (#30)
Connor-Colenso Dec 30, 2022
ec1ed11
[ci skip] Update buildscript to RetroFuturaGradle
mitchej123 Jan 29, 2023
7b66e23
[ci skip] spotlessApply with the new settings
mitchej123 Jan 29, 2023
13a4fdc
[ci skip] Add git-blame-ignore-revs for spotlessApply
mitchej123 Jan 29, 2023
d09e972
[ci skip] upgraded build system
eigenraven Jan 31, 2023
a02cad1
Proper fix for null ItemData (#31)
miozune Feb 16, 2023
427df61
Move helper methods out of client side (#32)
minecraft7771 Feb 16, 2023
dcff2ac
Fix server crash with I18n (#33)
miozune Mar 12, 2023
749ee1a
Cleanup (#34)
glowredman May 25, 2023
aa3b5f4
Cleanup (#36)
miozune Jun 18, 2023
0e59b43
T9 Planets + new Textures (#35)
glowredman Jul 30, 2023
81f9f80
[ci skip] upgraded build system
eigenraven Jan 8, 2024
c434cee
update deps+bs
Dream-Master Jan 12, 2024
9cddf35
[ci skip] upgraded build system
eigenraven Feb 4, 2024
a30ab18
Remove unnecessary check (#37)
RealSilverMoon May 28, 2024
c85896e
update
Dream-Master May 28, 2024
41a2633
exclude circular dep (#38)
chochem May 28, 2024
e080e3d
Disable `useDependencyInformation`
glowredman Jun 25, 2024
a474048
update
Dream-Master Jun 28, 2024
b95ed37
Remove Space from "Mehen Belt" (#40)
glowredman Jul 17, 2024
1bd2b04
fix mehen belt lang (#41)
chochem Aug 8, 2024
2ccf8c4
update
Dream-Master Aug 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This is the universal Text Editor Configuration
# for all GTNewHorizons projects
# See: https://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{bat,ini}]
end_of_line = crlf

[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
indent_size = 2

[*.lang]
trim_trailing_whitespace = false
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore spotlessApply reformat
7b66e23199db44891c57865160afb5c66f6fd94f
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
* text eol=lf

*.[jJ][aA][rR] binary

*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary

*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary

*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary

*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary

*.[pP][aA][tT][cC][hH] -text

*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf

*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
51 changes: 51 additions & 0 deletions .github/scripts/test_no_error_reports
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/usr/bin/env bash

# bashsupport disable=BP5006 # Global environment variables
RUNDIR="run" \
CRASH="crash-reports" \
SERVERLOG="server.log"

# enable nullglob to get 0 results when no match rather than the pattern
shopt -s nullglob

# store matches in array
crash_reports=("$RUNDIR/$CRASH/crash"*.txt)

# if array not empty there are crash_reports
if [ "${#crash_reports[@]}" -gt 0 ]; then
# get the latest crash_report from array
latest_crash_report="${crash_reports[-1]}"
{
printf 'Latest crash report detected %s:\n' "${latest_crash_report##*/}"
cat "$latest_crash_report"
} >&2
exit 1
fi

if grep --quiet --fixed-strings 'Fatal errors were detected' "$SERVERLOG"; then
{
printf 'Fatal errors detected:\n'
cat server.log
} >&2
exit 1
fi

if grep --quiet --fixed-strings 'The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED' \
"$SERVERLOG"; then
{
printf 'Server force stopped:'
cat server.log
} >&2
exit 1
fi

if ! grep --quiet --perl-regexp --only-matching '.+Done \(.+\)\! For help, type "help" or "\?"' "$SERVERLOG"; then
{
printf 'Server did not finish startup:'
cat server.log
} >&2
exit 1
fi

printf 'No crash reports detected'
exit 0
13 changes: 13 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

name: Build and test

on:
pull_request:
branches: [ master, main ]
push:
branches: [ master, main ]

jobs:
build-and-test:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
secrets: inherit
14 changes: 14 additions & 0 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

name: Release tagged build

on:
push:
tags: [ '*' ]

permissions:
contents: write

jobs:
release-tags:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
secrets: inherit
56 changes: 27 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
.git/
.gradle/
.settings/
build/
bin/
eclipse/
.gradle
.settings
/.idea/
/run/
/build/
/eclipse/
.classpath
.project

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/bin/
/config/
/crash-reports/
/logs/
options.txt
/saves/
usernamecache.json
banned-ips.json
banned-players.json
eula.txt
ops.json
server.properties
servers.dat
usercache.json
whitelist.json
/out/
*.iml
*.ipr
*.iws
src/main/resources/mixins.*.json
*.bat
3 changes: 3 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Any Github changes require admin approval
/.github/** @GTNewHorizons/admin

Loading