svr333
|
7f8ef8be84
|
Minor tweaks
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2022-01-02 15:17:45 +01:00 |
|
TheBusyBiscuit
|
eac32ac94c
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2022-01-02 12:51:38 +01:00 |
|
TheBusyBiscuit
|
f2f3a6c719
|
Fixed unit test
|
2022-01-02 12:51:30 +01:00 |
|
TheBusyBiscuit
|
730f2676b3
|
Merge pull request #3401 from variananora/feature/add-fuel-to-bio-reactor
Add fuel types to BioGenerator
|
2022-01-02 12:48:06 +01:00 |
|
TheBusyBiscuit
|
03a40c0455
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2022-01-02 12:47:38 +01:00 |
|
TheBusyBiscuit
|
3d87cb3df1
|
Fixed #3400
|
2022-01-02 12:47:22 +01:00 |
|
Varian Anora
|
9703016ae2
|
Added 1.17 items and blocks
|
2022-01-02 18:31:46 +07:00 |
|
Varian Anora
|
311d600095
|
Add fuel types to BioGenerator
|
2022-01-02 18:02:52 +07:00 |
|
Senne
|
ef8e84a350
|
Invert if statement
|
2022-01-01 22:48:16 +01:00 |
|
Senne
|
4792124224
|
Refactor MiddleClickListener
|
2022-01-01 22:46:11 +01:00 |
|
TheBusyBiscuit
|
3993f48499
|
Some boring refactoring work
|
2022-01-01 14:34:36 +01:00 |
|
TheBusyBiscuit
|
b5b13756bf
|
[CI skip] Merge pull request #3398 from Slimefun/renovate/net.imprex-orebfuscator-api-5.x
Update dependency net.imprex:orebfuscator-api to v5.2.2
|
2022-01-01 13:09:07 +01:00 |
|
Renovate Bot
|
9ab5492f70
|
Update dependency net.imprex:orebfuscator-api to v5.2.2
|
2022-01-01 08:04:09 +00:00 |
|
TheBusyBiscuit
|
0538e34578
|
Added Armored Jetpack recipe (resolves #1315)
|
2022-01-01 01:01:52 +01:00 |
|
TheBusyBiscuit
|
96aaa9de43
|
Fixed #3368
|
2022-01-01 00:57:13 +01:00 |
|
TheBusyBiscuit
|
8114729e16
|
Fixed #3390
|
2021-12-31 18:29:21 +01:00 |
|
TheBusyBiscuit
|
77da680ff9
|
[CI skip] You didn't see anything 👀
What? No, I didn't forget about this, you did!
|
2021-12-31 18:12:03 +01:00 |
|
TheBusyBiscuit
|
e992171a0a
|
[CI skip] Merge pull request #3394 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.207
|
2021-12-28 13:19:43 +01:00 |
|
Renovate Bot
|
9dfa98a4d3
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.207
|
2021-12-28 10:34:12 +00:00 |
|
TheBusyBiscuit
|
7cf3b67ebc
|
[CI skip] Merge pull request #3393 from variananora/chores/add-1.18-to-bug-report
Add 1.18.x version to bug report
|
2021-12-28 10:14:06 +01:00 |
|
Varian Anora
|
1f3377c87f
|
Add 1.18.x version to bug report
|
2021-12-28 07:50:09 +07:00 |
|
TheBusyBiscuit
|
35e25eb859
|
Merge pull request #3392 from qwertyuioplkjhgfd/fix/easter-apple-pie
fix easter apple pie recipe output
|
2021-12-27 23:21:24 +01:00 |
|
TheBusyBiscuit
|
081e22d4d0
|
[CI skip] Updated changelog
|
2021-12-27 23:21:13 +01:00 |
|
qwertyuioplkjhgfd
|
330b5ff91d
|
lol
|
2021-12-27 11:21:21 -08:00 |
|
TheBusyBiscuit
|
b7d5eec3a5
|
[CI skip] Merge pull request #3388 from Slimefun/renovate/me.clip-placeholderapi-2.x
Update dependency me.clip:placeholderapi to v2.11.1
|
2021-12-25 20:06:22 +01:00 |
|
Renovate Bot
|
575ef205e4
|
Update dependency me.clip:placeholderapi to v2.11.1
|
2021-12-24 18:17:04 +00:00 |
|
TheBusyBiscuit
|
e065ea46cb
|
Merge pull request #3387 from Slimefun/fix/1.18_android_movement
Fixes #3385
|
2021-12-24 12:15:19 +01:00 |
|
TheBusyBiscuit
|
a6ca97722b
|
[CI skip] Updated changelog
|
2021-12-24 12:15:03 +01:00 |
|
TheBusyBiscuit
|
2775490d36
|
[CI skip] Merge pull request #3382 from Slimefun/renovate/actions-setup-java-2.x
Update actions/setup-java action to v2.5.0
|
2021-12-24 12:12:39 +01:00 |
|
TheBusyBiscuit
|
2be01242bd
|
[CI skip] Merge pull request #3386 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.0
|
2021-12-24 12:12:31 +01:00 |
|
Alessio Colombo
|
3c32194507
|
Fixed import order
|
2021-12-22 22:58:59 +01:00 |
|
Alessio Colombo
|
d96fa92957
|
Fixes #3385
|
2021-12-22 22:54:56 +01:00 |
|
Alessio Colombo
|
b46140202c
|
Fixed android movement below y=0
|
2021-12-22 22:38:12 +01:00 |
|
Renovate Bot
|
9c8f3f5c46
|
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.0
|
2021-12-22 21:16:34 +00:00 |
|
Renovate Bot
|
02512f309d
|
Update actions/setup-java action to v2.5.0
|
2021-12-21 11:55:08 +00:00 |
|
TheBusyBiscuit
|
e755756dad
|
Merge pull request #3305 from Slimefun/feature/farmer_talisman
Added Talisman of the Farmer (approved suggestion)
|
2021-12-21 10:42:47 +01:00 |
|
TheBusyBiscuit
|
8229935b3a
|
[CI skip] Fixed Unit Test
|
2021-12-21 10:32:39 +01:00 |
|
TheBusyBiscuit
|
230ea07ca1
|
[CI skip] Merge pull request #3381 from qwertyuioplkjhgfd/master
make parachute class respect constructor recipetype parameter
|
2021-12-21 10:25:12 +01:00 |
|
TheBusyBiscuit
|
281055b5a6
|
[CI skip] Merge pull request #3380 from Slimefun/renovate/me.clip-placeholderapi-2.x
Update dependency me.clip:placeholderapi to v2.11.0
|
2021-12-21 10:24:01 +01:00 |
|
qwertyuioplkjhgfd
|
9723d6af80
|
this is probably unintended?
|
2021-12-20 23:30:56 -08:00 |
|
Renovate Bot
|
c203aba874
|
Update dependency me.clip:placeholderapi to v2.11.0
|
2021-12-20 18:58:36 +00:00 |
|
Alessio Colombo
|
8116820a53
|
Bleh
|
2021-12-20 14:04:16 +01:00 |
|
Alessio Colombo
|
2d526f30b4
|
Moved double drops to helper method
|
2021-12-20 13:37:01 +01:00 |
|
Daniel Walsh
|
c580f296be
|
[CI Skip] Merge pull request #3377 from Slimefun/api/improve-biomemaps-api
|
2021-12-19 11:09:31 +00:00 |
|
Daniel Walsh
|
77aa308a76
|
Oops
|
2021-12-18 18:13:40 +00:00 |
|
Daniel Walsh
|
6bfc2a1a40
|
Remove SF only method
|
2021-12-18 17:55:51 +00:00 |
|
TheBusyBiscuit
|
377f262c05
|
[CI skip] Add jitpack configuration
|
2021-12-18 18:16:16 +01:00 |
|
Daniel Walsh
|
18665692b8
|
Improved the API for BiomeMap
|
2021-12-18 13:49:41 +00:00 |
|
TheBusyBiscuit
|
7052098678
|
[CI skip] Merge pull request #3346 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.206
|
2021-12-18 14:00:50 +01:00 |
|
Renovate Bot
|
f3d91c5b87
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.206
|
2021-12-18 12:51:23 +00:00 |
|