Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
133 changes: 21 additions & 112 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,118 +1,27 @@
# User-specific stuff
.idea/

*.iml
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project

# idea
out
*.ipr
*.iws
*.iml
.idea

# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

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

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# gradle
build
.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting

# Cache of project
.gradletasknamecache

**/build/

# Common working directory
run/
# other
eclipse
run
libs
imgs

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Files from Forge MDK
forge*changelog.txt
165 changes: 0 additions & 165 deletions LICENSE

This file was deleted.

8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {

apply plugin: 'net.minecraftforge.gradle'

version = modVersion
version = minecraftVersion + '-' + modVersion
group = modGroup
archivesBaseName = modName

Expand Down Expand Up @@ -48,12 +48,12 @@ repositories {

dependencies {
minecraft 'net.minecraftforge:forge:' + minecraftVersion + '-' + forgeVersion
implementation fg.deobf('curse.maven:serene-seasons-' + sereneSeasonsId + ':' + sereneSeasonsVersion)
implementation fg.deobf('curse.maven:pixelmon-' + pixelmonId + ':' + pixelmonVersion)
implementation files('libs/Pixelmon-' + minecraftVersion + '-' + pixelmonVersion + '-universal.jar')
implementation files('libs/SereneSeasons-' + minecraftVersion + '-' + sereneSeasonsVersion + '-universal.jar')
}

processResources {
filesMatching('mcmod.info') {
filesMatching('META-INF/mods.toml') {
expand(
'modId': modId,
'modName': modName,
Expand Down
14 changes: 6 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ modName=PixelSeasons
modId=pixelseasons
modVersion=1.0.0
modGroup=pt.licious.pixelseasons
mappingsChannel=stable
mappingsVersion=39-1.12
minecraftVersion=1.12.2
forgeVersion=14.23.5.2860
mappingsChannel=official
mappingsVersion=1.16.5
minecraftVersion=1.16.5
forgeVersion=36.2.39

sereneSeasonsId=291874
sereneSeasonsVersion=2799213
sereneSeasonsVersion=4.0.1.130

pixelmonId=389487
pixelmonVersion=3576155
pixelmonVersion=9.1.7
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading