Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
24f5eed
Update README.md
Dream-Master Mar 1, 2017
92e154a
small fix
Dream-Master Mar 1, 2017
ac1d1a5
change values for GTNH Pack
Dream-Master Mar 1, 2017
6efb270
Small name fixes
Dream-Master Mar 1, 2017
6b4df7e
added missing sngularities.
Dream-Master Mar 3, 2017
11d709c
change Color a bit
Dream-Master Mar 3, 2017
b62d6ac
change color a bit.
Dream-Master Mar 3, 2017
397c103
more singularities
Dream-Master Mar 3, 2017
8628ac1
bump version
Dream-Master Mar 3, 2017
6bdb1d6
some fixes and additions
Dream-Master Mar 3, 2017
46806af
more addition and changes
Dream-Master Mar 3, 2017
9e6a55e
more work
Dream-Master Mar 3, 2017
b4020c1
bump version
Dream-Master Mar 3, 2017
2d597b0
this Materials have no Block.
Dream-Master Mar 3, 2017
2b845c8
name change to make Phosphorus working again
Dream-Master Mar 19, 2019
f815efa
add loclizer
Dream-Master Aug 4, 2019
7199a68
bump version
Dream-Master Aug 4, 2019
c3b52ce
update gradle
Dream-Master Aug 4, 2019
75c8571
update gradle
Dream-Master Feb 13, 2020
c1937bd
[Suggest]Fine tune the number of singularities for automation #5567
Dream-Master Feb 13, 2020
239cb8d
bump version
Dream-Master Feb 13, 2020
c9f73a0
Create zh_CN.lang
May 30, 2020
9a14730
Merge pull request #1 from Kiwi233/master
Dream-Master May 30, 2020
94164d5
bump version
Dream-Master May 31, 2020
2d5cdae
Change from TC to GT block of ender
Prometheus0000 Dec 11, 2020
db22c5e
Merge pull request #2 from Prometheus0000/Fix
Dream-Master Dec 11, 2020
0932d0e
bump version
Dream-Master Dec 15, 2020
bf60a1c
Fix Jenkins link in README
glowredman Apr 25, 2021
8173581
Fix buildscript
glowredman Apr 26, 2021
87330d4
Merge pull request #3 from FPSP-Modpack/master
Dream-Master Apr 27, 2021
b5449d0
fixed tricalcium phosphate singularity name
boubou19 May 2, 2021
b857ef2
Merge pull request #4 from boubou19/master
Dream-Master May 2, 2021
a6c880b
bump version
Dream-Master May 16, 2021
d5f0fb8
Buff Draconium, Awakened Draconium and Nether Star singularity cost
LewisSaber Feb 8, 2022
fe457e5
Merge pull request #5 from LewisSaber/master
Dream-Master Feb 8, 2022
46a489f
update buildscript
bombcar Feb 8, 2022
88eb757
Merge pull request #6 from GTNewHorizons/updatebuild
Dream-Master Feb 8, 2022
cc332e4
permission granted
bombcar Feb 9, 2022
c6b3fd3
permission screenshot
bombcar Feb 9, 2022
b6eb50f
Merge pull request #7 from GTNewHorizons/perms
boubou19 Feb 9, 2022
0e20c74
fix typos (#8)
bombcar Feb 10, 2022
1aa8ae8
[ci skip] Migrate github actions to GTNH-Actions-Workflows
mitchej123 Jul 16, 2022
c273e21
[ci skip] Update buildscript to RetroFuturaGradle
mitchej123 Jan 29, 2023
4407b86
[ci skip] spotlessApply with the new settings
mitchej123 Jan 30, 2023
aa2b9c4
[ci skip] Add git-blame-ignore-revs for spotlessApply
mitchej123 Jan 30, 2023
08eba69
[ci skip] upgraded build system
eigenraven Jan 31, 2023
fe3fc0a
updateBuildscript
eigenraven Feb 9, 2023
0af4fd7
Update dependencies.gradle
Dream-Master Apr 16, 2023
b123668
update bs+sa
Dream-Master Apr 16, 2023
be1294b
update dep file
Dream-Master Apr 16, 2023
49c9271
[ci skip] upgraded build system
eigenraven Jan 8, 2024
47504f3
[bs] spotless apply for jenkins (#9)
bombcar Jan 9, 2024
b902c6b
[ci skip] upgraded build system
eigenraven Feb 4, 2024
52f58ad
Added gangue singularity (#10)
FourIsTheNumber Aug 30, 2024
9e15839
update
Dream-Master Aug 30, 2024
37bd267
Add Localization (#11)
glowredman Jan 2, 2025
addd1b8
update
Dream-Master Jan 3, 2025
673f7f7
Add Rose Gold singularity, intended to replace Aluminum Brass singula…
YannickMG Jan 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
4407b867ca1a5235152cd4b78ee13160930e599b
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
27 changes: 27 additions & 0 deletions .github/scripts/test-no-error-reports.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
if [[ -d "run/crash-reports" ]]; then
echo "Crash reports detected:"
cat $directory/*
exit 1
fi

if grep --quiet "Fatal errors were detected" server.log; then
echo "Fatal errors detected:"
cat server.log
exit 1
fi

if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
echo "Server force stopped:"
cat server.log
exit 1
fi

if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
echo "Server didn't finish startup:"
cat server.log
exit 1
fi

echo "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
41 changes: 29 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
.gradle/
build/
out/
run/
server/
eclipse/
src/META-INF/
/*.iws
/*.ipr
/*.iml
bin/
.gradle
.settings
/.idea/
/run/
/build/
/eclipse/
.classpath
.project
.settings/
/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
*.DS_Store
!gradlew.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

11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Universal Singularities
The Official Github Repository of the Mod, <a href="https://minecraft.curseforge.com/projects/universal-singularities">Universal Singularities</a>!
The Unofficial Github Repository of the Mod (Universal Singularities](https://minecraft.curseforge.com/projects/universal-singularities) (GTNH Fork)!

Made and Maintained By:
<a href="https://github.com/Wealthyturtle">Wealthyturtle</a> and <a href="https://github.com/Wanioncane">WanionCane</a>
Originally made by [Wealthyturtle](https://github.com/Wealthyturtle) and [WanionCane](https://github.com/Wanioncane)

# Fork

This mod was forked by the GTNH Team to continue the development of the 1.7.10 Branch. The up-to-date Master branch can be found on our [Jenkins](http://jenkins.usrv.eu:8080/job/Universal-Singularities/).

[Permission](permission.png) was kindly granted to maintain and release.
67 changes: 3 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,66 +1,5 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}

apply plugin: 'forge'

version = "1.7.10-8.0"
group= "wealthyturtle.uiesingularities" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Universal Singularities"

minecraft {
version = "1.7.10-10.13.4.1614-1.7.10"
runDir = "eclipse"
}

sourceCompatibility = 1.8
targetCompatibility = 1.8

dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"

// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env

// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

}

processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
//version: 1707058017

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
plugins {
id 'com.gtnewhorizons.gtnhconvention'
}
6 changes: 6 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Add your dependencies here

dependencies {
api 'com.github.GTNewHorizons:Avaritia:1.59:dev'
compileOnly 'com.github.GTNewHorizons:NotEnoughItems:2.7.11-GTNH:dev'
}
Loading