Commit Graph

805 Commits

Author SHA1 Message Date
Fernando Pettinelli
904a6cb22c Merge remote-tracking branch 'origin/master' 2021-09-30 13:11:40 -03:00
Fernando Pettinelli
e2b8f61385 Merge branch 'development'
# Conflicts:
#	Compatibility/pom.xml
#	Core/pom.xml
#	Core/src/main/java/com/songoda/core/SongodaCore.java
#	NMS/NMS-API/pom.xml
#	NMS/NMS-v1_10_R1/pom.xml
#	NMS/NMS-v1_11_R1/pom.xml
#	NMS/NMS-v1_12_R1/pom.xml
#	NMS/NMS-v1_13_R1/pom.xml
#	NMS/NMS-v1_13_R2/pom.xml
#	NMS/NMS-v1_14_R1/pom.xml
#	NMS/NMS-v1_15_R1/pom.xml
#	NMS/NMS-v1_16_R1/pom.xml
#	NMS/NMS-v1_16_R2/pom.xml
#	NMS/NMS-v1_16_R3/pom.xml
#	NMS/NMS-v1_17_R1/pom.xml
#	NMS/NMS-v1_8_R1/pom.xml
#	NMS/NMS-v1_8_R2/pom.xml
#	NMS/NMS-v1_8_R3/pom.xml
#	NMS/NMS-v1_9_R1/pom.xml
#	NMS/NMS-v1_9_R2/pom.xml
#	pom.xml
2021-09-30 13:11:16 -03:00
Fernando Pettinelli
820b7ffbd3 Version 2.5.11 2021-09-30 13:03:36 -03:00
Fernando Pettinelli
133388ea87 Adds raw ores to the getBurnResult method, add isBrewingStandIngredient. 2021-09-30 13:02:12 -03:00
Christian Koop
183d56c488
Update .github/FUNDING.yml (Adds Songoda+ page) 2021-09-25 21:22:52 +02:00
Christian Koop
c3caf391cd
Update .gitignore 2021-09-25 21:21:01 +02:00
Christian Koop
799bf30651
Version 2.5.10 2021-08-30 21:53:47 +02:00
Fernando Pettinelli
0cd5f9071b Merge branch 'development' 2021-08-29 17:44:49 -04:00
Fernando Pettinelli
a601b86d68 Added Residence support. 2021-08-29 17:44:17 -04:00
Fernando Pettinelli
de8bf59168 Add PIGLIN_BRUTE_SPAWN_EGG material. (This is the right one) 2021-08-29 16:04:59 -04:00
Fernando Pettinelli
6951a7f4ad Merge remote-tracking branch 'origin/development' into development 2021-08-29 16:03:20 -04:00
Fernando Pettinelli
3ee798fe23 Add PIGLIN_BRUTE_SPAWN_EGG material. 2021-08-29 16:03:08 -04:00
Christian Koop
7fa66b2220
Merge branch 'development' 2021-08-29 15:51:25 +02:00
Christian Koop
5921be70bb
Version 2.5.9 2021-08-29 15:49:06 +02:00
Christian Koop
2ed245389f
Allows respecting Unbreaking-Enchantment [SD-8182] 2021-08-29 15:49:06 +02:00
Christian Koop
03e2360a98
Updated logging to mostly use java.util.logging.Logger [SD-8645] 2021-08-29 13:49:01 +02:00
Christian Koop
3d8a08508a
Merge 'Don't try to change item meta when there is none' (#20) 2021-08-18 20:56:54 +02:00
Christian Koop
c5569adc10
Change formatting a bit 2021-08-18 20:56:05 +02:00
ajgeiss0702
9f5daa2503
Don't try to change item meta when there is none 2021-08-06 20:40:56 -07:00
Christian Koop
949228f5cd
GitHub-Actions: Contact Discord for specific branches
Only for `master` and `development`

[skip ci]
2021-07-08 20:44:35 +02:00
Christian Koop
20c3eceea2
GitHub-Actions: Send build status to Discord 2021-07-08 19:30:11 +02:00
Christian Koop
e65dcc67cb
Merge branch 'development' 2021-07-08 17:50:27 +02:00
Christian Koop
60ceac5eb6 Version 2.5.8 2021-07-08 17:50:13 +02:00
Christian Koop
8eefbce68d Change dependency com.github.Zrips.Jobs version from LATEST to v4.17.2 2021-07-08 17:50:13 +02:00
Christian Koop
e1742385c5
Update GitHub-Actions 2021-07-08 15:47:34 +02:00
Christian Koop
6dbf806e7d EditorConfig 2021-07-08 15:37:37 +02:00
Christian Koop
685aa4bc8a Dependabot, FUNDING, README 2021-07-08 15:37:37 +02:00
Christian Koop
a73ed7908e Update pom.xml files and project structure
* Should fix IntelliJ sometimes not finding classes
* Should make things easier to understand and maintain
* Rename `LICENSE.md` to `LICENSE`
2021-07-08 15:37:37 +02:00
Christian Koop
f5bf5903c7
Dependency: Update mcMMO from v2.1.50 to v2.1.200
This fixes failing maven builds reporting a http repo being used and blocked - As only the patch version has been increased, there should be no problem related to this update (Core's only getting compiled against it's API anyway)
2021-07-06 13:15:17 +02:00
Christian Koop
3bc35058ac
CompatibleMaterial: Add missing BLACKSTONE_SLAB 2021-07-05 11:48:10 +02:00
Fernando Pettinelli
a33024ee81 Merge branch 'development' 2021-06-30 10:25:21 -04:00
Fernando Pettinelli
e6398bca1f Version 2.5.7 2021-06-30 10:24:50 -04:00
Fernando Pettinelli
b53c4c8c87 Renamed GRASS_PATH to DIRT_PATH for 1.17. 2021-06-30 10:13:46 -04:00
Fernando Pettinelli
c8653159d9 Revert "Fix GRASS_PATH"
This reverts commit 3dc2f5a0
Apparently I'm too dumb to remember to always commit to development.
2021-06-30 10:10:46 -04:00
Fernando Pettinelli
3dc2f5a0d3 Fix GRASS_PATH 2021-06-30 10:09:35 -04:00
Christian Koop
d4a299f35f Add methods to force randomTicks and spawner ticks 2021-06-26 17:11:57 +02:00
Christian Koop
64fa850955 GitHub-Actions: Use JDK 16 2021-06-25 16:21:56 +02:00
Brianna
4c5a2b0615 Merge branch 'development' 2021-06-21 17:18:59 -05:00
Brianna
dddbc32459 version 2.5.6 2021-06-21 17:18:51 -05:00
Brianna
711125aa67 Added support for Worldborders in 1.17 2021-06-21 17:18:18 -05:00
Brianna
563ea5a268 Merge branch 'development' 2021-06-13 18:09:13 -05:00
Brianna
ebf0d06434 version 2.5.5 2021-06-13 18:08:18 -05:00
Brianna
c861aafe82 Added Lootables to SongodaCore. 2021-06-13 18:04:16 -05:00
Brianna
ee454b7a96 Merge branch 'development' 2021-06-13 16:59:48 -05:00
Brianna
7430fcc34a version 2.5.4 2021-06-13 16:58:57 -05:00
Brianna
26f27d7b4f Add another class mapping. 2021-06-13 16:58:53 -05:00
Brianna
6c197d3309 Fixed some typos. 2021-06-13 16:47:36 -05:00
Brianna
b7a6981a83 Merge branch 'development' 2021-06-13 13:23:39 -05:00
Brianna
947e0d5b2d version 2.5.3 2021-06-13 13:23:29 -05:00
Brianna
76ea7f128f Ease of access. 2021-06-13 13:23:21 -05:00