Merge pull request 'feat/1-update_assets' (#2) from feat/1-update_assets into 1.20
Reviewed-on: #2
This commit is contained in:
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1,8 +1,8 @@
|
||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||
*.kra filter=lfs diff=lfs merge=lfs -text
|
||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
*.mtl filter=lfs diff=lfs merge=lfs -text
|
||||
*.bbmodel filter=lfs diff=lfs merge=lfs -text
|
||||
*.kra filter=lfs diff=lfs merge=lfs -text
|
||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
227
.gitignore
vendored
227
.gitignore
vendored
@ -1,6 +1,221 @@
|
||||
/.gradle/
|
||||
/.idea/
|
||||
/build/
|
||||
/run/
|
||||
/src/test/
|
||||
/src/generated/resources/.cache/
|
||||
### Assets
|
||||
*.blend?
|
||||
*.kra~
|
||||
|
||||
### Java template
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# 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*
|
||||
replay_pid*
|
||||
|
||||
### JetBrains template
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
.idea/*
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/artifacts
|
||||
# .idea/compiler.xml
|
||||
# .idea/jarRepositories.xml
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# SonarLint plugin
|
||||
.idea/sonarlint/
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
### ForgeGradle template
|
||||
# Minecraft client/server files
|
||||
run/
|
||||
|
||||
### Java template
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# 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*
|
||||
replay_pid*
|
||||
|
||||
### JetBrains template
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
.idea/**/tasks.xml
|
||||
.idea/**/usage.statistics.xml
|
||||
.idea/**/dictionaries
|
||||
.idea/**/shelf
|
||||
|
||||
# AWS User-specific
|
||||
.idea/**/aws.xml
|
||||
|
||||
# Generated files
|
||||
.idea/**/contentModel.xml
|
||||
|
||||
# Sensitive or high-churn files
|
||||
.idea/**/dataSources/
|
||||
.idea/**/dataSources.ids
|
||||
.idea/**/dataSources.local.xml
|
||||
.idea/**/sqlDataSources.xml
|
||||
.idea/**/dynamic.xml
|
||||
.idea/**/uiDesigner.xml
|
||||
.idea/**/dbnavigator.xml
|
||||
|
||||
# Gradle
|
||||
.idea/**/gradle.xml
|
||||
.idea/**/libraries
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/artifacts
|
||||
# .idea/compiler.xml
|
||||
# .idea/jarRepositories.xml
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# SonarLint plugin
|
||||
.idea/sonarlint/
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
### ForgeGradle template
|
||||
# Minecraft client/server files
|
||||
run/
|
||||
|
||||
### Gradle template
|
||||
.gradle
|
||||
**/build/
|
||||
!src/**/build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
|
||||
# Avoid ignore Gradle wrappper properties
|
||||
!gradle-wrapper.properties
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
# Eclipse Gradle plugin generated files
|
||||
# Eclipse Core
|
||||
.project
|
||||
# JDT-specific (Eclipse Java Development Tools)
|
||||
.classpath
|
||||
|
||||
|
||||
BIN
assets/images/blender/totem_of_reviving.blend
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/totem_of_reviving.blend
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-Alpha.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-Alpha.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-RGB.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-RGB.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world-RGBA.png
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world-RGBA.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world.mtl
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/blender/world.obj
(Stored with Git LFS)
Normal file
BIN
assets/images/blender/world.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/banner-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/banner-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/banner.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/banner.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/card-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/card-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/card.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/card.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/logo-vignette.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/logo-vignette.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/logo.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/logo.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/renders/totems.png
(Stored with Git LFS)
Normal file
BIN
assets/images/renders/totems.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/banner.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/banner.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/banner.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/banner.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/card.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/card.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/card.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/card.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/logo.jpg
(Stored with Git LFS)
Normal file
BIN
assets/images/web/logo.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/images/web/logo.kra
(Stored with Git LFS)
Normal file
BIN
assets/images/web/logo.kra
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/diamond_totem/diamond-totem.bbmodel
(Stored with Git LFS)
Normal file
BIN
assets/items/diamond_totem/diamond-totem.bbmodel
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/diamond_totem/diamond-totem.mtl
(Stored with Git LFS)
Normal file
BIN
assets/items/diamond_totem/diamond-totem.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/diamond_totem/diamond-totem.obj
(Stored with Git LFS)
Normal file
BIN
assets/items/diamond_totem/diamond-totem.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/diamond_totem/diamond_totem.png
(Stored with Git LFS)
Normal file
BIN
assets/items/diamond_totem/diamond_totem.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/iron_totem/iron-totem.bbmodel
(Stored with Git LFS)
Normal file
BIN
assets/items/iron_totem/iron-totem.bbmodel
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/iron_totem/iron-totem.mtl
(Stored with Git LFS)
Normal file
BIN
assets/items/iron_totem/iron-totem.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/iron_totem/iron-totem.obj
(Stored with Git LFS)
Normal file
BIN
assets/items/iron_totem/iron-totem.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/iron_totem/iron_totem.png
(Stored with Git LFS)
Normal file
BIN
assets/items/iron_totem/iron_totem.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/netherite_totem/netherite-totem.bbmodel
(Stored with Git LFS)
Normal file
BIN
assets/items/netherite_totem/netherite-totem.bbmodel
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/netherite_totem/netherite-totem.mtl
(Stored with Git LFS)
Normal file
BIN
assets/items/netherite_totem/netherite-totem.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/netherite_totem/netherite-totem.obj
(Stored with Git LFS)
Normal file
BIN
assets/items/netherite_totem/netherite-totem.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/netherite_totem/netherite_totem.png
(Stored with Git LFS)
Normal file
BIN
assets/items/netherite_totem/netherite_totem.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/straw_totem/straw-totem.bbmodel
(Stored with Git LFS)
Normal file
BIN
assets/items/straw_totem/straw-totem.bbmodel
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/straw_totem/straw-totem.mtl
(Stored with Git LFS)
Normal file
BIN
assets/items/straw_totem/straw-totem.mtl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/straw_totem/straw-totem.obj
(Stored with Git LFS)
Normal file
BIN
assets/items/straw_totem/straw-totem.obj
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/items/straw_totem/straw_totem.png
(Stored with Git LFS)
Normal file
BIN
assets/items/straw_totem/straw_totem.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/main/resources/logo.jpg
(Stored with Git LFS)
BIN
src/main/resources/logo.jpg
(Stored with Git LFS)
Binary file not shown.
Reference in New Issue
Block a user