TheBusyBiscuit
|
5f8bd1b909
|
[Ci skip] Fixed typo from before
|
2021-06-03 18:42:53 +02:00 |
|
TheBusyBiscuit
|
6ae9f6a31e
|
[CI skip] Updated contributing.md again
|
2021-06-03 18:42:31 +02:00 |
|
TheBusyBiscuit
|
6071e1b952
|
[CI skip] Updated style preferences in contributing.md
|
2021-06-03 18:38:39 +02:00 |
|
TheBusyBiscuit
|
67c0534bcb
|
[CI skip] Merge pull request #3101 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.11.0
|
2021-06-03 18:19:17 +02:00 |
|
Renovate Bot
|
8e18548ff7
|
Update dependency org.mockito:mockito-core to v3.11.0
|
2021-06-03 15:11:57 +00:00 |
|
TheBusyBiscuit
|
0224f94edf
|
Merge pull request #3096 from martinbrom/fix/auto-brewer
AutoBrewer fixes
|
2021-05-31 15:05:57 +02:00 |
|
TheBusyBiscuit
|
5a327be4ce
|
[CI skip] Updated changelog
|
2021-05-31 15:05:45 +02:00 |
|
Martin Brom
|
33340d0dd0
|
Apply suggestions from code review
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-05-31 10:32:56 +02:00 |
|
TheBusyBiscuit
|
d39a5c1ba2
|
Fixed #3086
|
2021-05-31 10:26:42 +02:00 |
|
Martin Brom
|
bd6efaf632
|
Fix AutoBrewer stripping redstone/glowstone modifiers when fermenting a potion
Resolves #3095
|
2021-05-31 10:08:58 +02:00 |
|
Martin Brom
|
87b0812c2e
|
Fix IllegalArgumentException when trying to brew invalid potions
Resolves #3093
|
2021-05-31 10:08:58 +02:00 |
|
Daniel Walsh
|
cccf6a1bb7
|
Merge pull request #3092 from martinbrom/fix/terminal-exception
|
2021-05-30 14:29:16 +01:00 |
|
Martin Brom
|
d23f1265b3
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-05-30 13:49:43 +02:00 |
|
Martin Brom
|
cda2228a7d
|
Fix IllegalArgumentException when ChestTerminal is requesting items
Resolves #3091
|
2021-05-30 13:20:09 +02:00 |
|
TheBusyBiscuit
|
cf362f7c7a
|
Fixed #3087
|
2021-05-29 10:35:41 +02:00 |
|
TheBusyBiscuit
|
ab2049d1d2
|
Fixed #3088
|
2021-05-29 10:31:38 +02:00 |
|
TheBusyBiscuit
|
477cad5487
|
Fixed #3085
|
2021-05-29 00:40:32 +02:00 |
|
TheBusyBiscuit
|
76dda9a439
|
Fixed #3084
|
2021-05-29 00:21:37 +02:00 |
|
TheBusyBiscuit
|
343f47bdb6
|
Merge pull request #3083 from J3fftw1/feature/added-time_date-to-error-report
added time and date to error report
|
2021-05-29 00:16:05 +02:00 |
|
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 |
|