1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

6760 Commits

Author SHA1 Message Date
Jeffrey Kosse
990cc48feb did requested changes 2021-05-28 19:38:22 +02:00
Jeffrey Kosse
1b2d3e683e removed redundant formatter 2021-05-28 18:30:35 +02:00
Jeffrey Kosse
ab534dc4f4 did requested changes 2021-05-28 18:28:49 +02:00
J3fftw
ba4767ae05
Update ErrorReport.java 2021-05-28 18:24:28 +02:00
J3fftw
3205d83e35
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-05-28 18:23:17 +02:00
Jeffrey Kosse
8f6d9209c1 added time and date to error report 2021-05-28 18:16:24 +02:00
TheBusyBiscuit
a36f487fff Added back setters and getters for GEOMiner tier configuration 2021-05-28 15:10:55 +02:00
TheBusyBiscuit
6c9f8721be
Merge pull request #2779 from Slimefun/api/machine-operations
Rewrote Machine Processing API
2021-05-28 14:44:05 +02:00
TheBusyBiscuit
7362907d2e
[CI skip] Merge pull request #3082 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.1.0
2021-05-27 22:05:21 +02:00
Renovate Bot
805b072bb8
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.1.0 2021-05-27 19:38:11 +00:00
TheBusyBiscuit
3ff1197971
Merge pull request #3080 from Mooy1/slimefun-item-small-recipes
Easier SlimefunItem creation with small recipe
2021-05-27 13:14:11 +02:00
TheBusyBiscuit
5d293128cc
[CI skip] Merge pull request #3081 from Slimefun/renovate/pascalgn-automerge-action-0.x
Update pascalgn/automerge-action action to v0.14.2
2021-05-26 23:00:09 +02:00
Renovate Bot
1edfd76b87
Update pascalgn/automerge-action action to v0.14.2 2021-05-26 20:52:45 +00:00
Riley
80a31b02fc Update SlimefunItem.java 2021-05-26 14:06:27 -05:00
TheBusyBiscuit
96c006252c
[CI skip] Merge pull request #3079 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
Update ibiqlik/action-yamllint action to v3.0.2
2021-05-26 11:01:49 +02:00
Renovate Bot
1fd49550be
Update ibiqlik/action-yamllint action to v3.0.2 2021-05-26 07:09:10 +00:00
Senne
3c31792532
Re-add imports 2021-05-25 22:31:06 +02:00
svr333
ba617a6ea6
Merge branch 'master' into api/machine-operations 2021-05-25 20:05:59 +02:00
TheBusyBiscuit
1be165ca44 Fixed recipe types showing missing string message 2021-05-25 11:04:59 +02:00
TheBusyBiscuit
709b329c78
Hotfix for addons using old ItemStackWrapper constructor 2021-05-25 01:34:55 +02:00
TheBusyBiscuit
fcfa164583 Bump recommended java versions notice to Java 16 2021-05-24 20:15:07 +02:00
TheBusyBiscuit
4ed9dd7e59 Fixed #3075 2021-05-24 20:07:03 +02:00
TheBusyBiscuit
3fc802ef8c [CI skip] Formatting and code cleanup 2021-05-24 18:18:21 +02:00
TheBusyBiscuit
1111c809dd [CI skip] Added Unit Test which makes sure Slimefun is spelled correctly 2021-05-24 17:40:35 +02:00
The Busy Bot
27013f5287
[CI skip] New locale updates from Crowdin 2021-05-24 17:21:28 +02:00
TheBusyBiscuit
8a3d5cedc4
Merge pull request #3048 from Slimefun/fix/improve-research-message
Add the item to the research message
2021-05-24 16:40:18 +02:00
TheBusyBiscuit
a6e3c460fd
Merge pull request #3068 from md5sha256/feature/optimized-cargo
Optimized use of ItemStackWrapper in the CargoNetworkTask
2021-05-24 14:24:24 +02:00
TheBusyBiscuit
9d3b8c7dbf
[CI skip] Updated changelog 2021-05-24 14:24:05 +02:00
TheBusyBiscuit
c1de61d1c1 Merge branch 'fix/improve-research-message' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message 2021-05-24 13:09:57 +02:00
TheBusyBiscuit
a5a8615af2 Updated changelog 2021-05-24 13:09:51 +02:00
TheBusyBiscuit
3e4af70e10 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message 2021-05-24 13:09:06 +02:00
TheBusyBiscuit
213c2b0e4d
Changed color to white now 2021-05-24 13:07:46 +02:00
TheBusyBiscuit
da6c909d3a
Update src/main/resources/languages/en/messages.yml 2021-05-24 13:06:54 +02:00
TheBusyBiscuit
31af8f3b25 Fixed #3053 2021-05-24 13:04:45 +02:00
TheBusyBiscuit
fd2d30a3ae Validate progress arguments 2021-05-24 11:23:36 +02:00
TheBusyBiscuit
466990a03e Switch to a Concurrent Map 2021-05-24 11:18:13 +02:00
TheBusyBiscuit
a249ca7848 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations 2021-05-24 11:09:52 +02:00
TheBusyBiscuit
d29e96b5df
[CI skip] Merge pull request #3073 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0
2021-05-22 19:17:55 +02:00
Andrew Wong
8fb1c7cdfb
Enforce nullability 2021-05-22 16:04:43 +02:00
Renovate Bot
769d299204
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0 2021-05-22 12:46:10 +00:00
Andrew Wong
5e94f454c8
Fix documentation for ItemStackAndInteger and tests for ItemStackWrapper 2021-05-21 13:29:45 +02:00
TheBusyBiscuit
36414486f0
[CI skip] Merge pull request #3072 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.0.1
2021-05-20 23:25:37 +02:00
Renovate Bot
bee1abf859
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.0.1 2021-05-20 19:58:31 +00:00
TheBusyBiscuit
ec51f534cb
[CI skip] Merge pull request #3071 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.8
2021-05-20 17:17:39 +02:00
Renovate Bot
986d6ae15d
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.8 2021-05-20 15:12:44 +00:00
Andrew Wong
57b559e81d
Fix nullability and docs 2021-05-19 18:57:29 +02:00
Andrew Wong
7e43e68f68
Method renames, update docs and unit tests 2021-05-19 18:19:04 +02:00
TheBusyBiscuit
e4225d7aec Fixed a permissions issue with /sf charge 2021-05-19 17:36:10 +02:00
TheBusyBiscuit
2e5bedc932
Merge pull request #3062 from martinbrom/feature/configurable-altar-speed
Add a configurable step delay to the Ancient Altar
2021-05-19 17:26:26 +02:00
TheBusyBiscuit
58fbc423af
Merge pull request #3052 from martinbrom/fix/woodcutter-android-stuck fixes #2964
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
2021-05-19 17:25:50 +02:00