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

5708 Commits

Author SHA1 Message Date
Mauricio Roberto
ac1788a98c Translate researches_pt-BR.yml via GitLocalize 2020-11-23 12:35:09 +00:00
TheBusyBiscuit
497359568e [Ci skip] Refactoring and documentation 2020-11-22 14:06:06 +01:00
CURVX
ef09b03af4 Blank line 2020-11-21 22:51:14 +05:30
CURVX
5e0e9d5490
Merge branch 'master' into fix/sf-machine-hopper 2020-11-21 22:21:34 +05:30
CURVX
7f385cdc8d Formatting changes 2020-11-21 22:17:55 +05:30
TheBusyBiscuit
f689c2fc4f Added an item setting to the Infused Hopper to toggle it with redstone 2020-11-21 15:34:09 +01:00
TheBusyBiscuit
3bd595a930 Fixes #2421 2020-11-21 14:18:54 +01:00
TheBusyBiscuit
55188bfd0a Fixes #2518 (+ refactoring and documentation) 2020-11-21 14:06:38 +01:00
TheBusyBiscuit
5bf3e38bae Fixed Armor Stands getting damaged/pushed by Explosive Bow 2020-11-20 13:39:25 +01:00
TheBusyBiscuit
1f32b160a5
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java
Co-authored-by: Senne Van Rompaey <vanrompaey.senne@protonmail.com>
2020-11-20 03:00:23 +01:00
TheBusyBiscuit
c5f6b53412 Updated unit tests for new elapsed time method 2020-11-20 00:34:29 +01:00
TheBusyBiscuit
d8563eb5dc Fixed some docs 2020-11-19 22:22:42 +01:00
TheBusyBiscuit
f2a6d97f29 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-11-19 22:21:01 +01:00
TheBusyBiscuit
15f281504f More performance and memory improvements 2020-11-19 22:20:43 +01:00
TheBusyBiscuit
bb764b7584 Fixed Guide Settings showing "last activity" as a negative number 2020-11-19 21:00:28 +01:00
TheBusyBiscuit
eea3254d11
Merge pull request #2555 from wzpzw5/patch-10
Fixed a bug of Duplicate items with BlockPlacer
2020-11-19 18:08:02 +01:00
TheBusyBiscuit
9f1b8790aa [Ci skip] Updated changelog 2020-11-19 18:07:16 +01:00
TheBusyBiscuit
8f3cad0419 [CI skip] Fixed two color codes related to the Elevator Plate 2020-11-19 18:06:17 +01:00
TheBusyBiscuit
8fab8268d4 [CI skip] Small change 2020-11-19 17:47:50 +01:00
TheBusyBiscuit
7e657c9810 A ton of performance improvements 2020-11-19 17:42:10 +01:00
TheBusyBiscuit
94752a9027 Fixes #2558 2020-11-19 15:01:47 +01:00
TheBusyBiscuit
c8d60ddc7b
Merge pull request #2494 from CURVX/fix/hopper-on-brew fixes #2447
Fixes brewing potion from Slimefun dusts using hopper
2020-11-19 14:46:39 +01:00
TheBusyBiscuit
177d1d81e0
[CI skip] Updated changelog 2020-11-19 14:45:55 +01:00
TheBusyBiscuit
86715cd3d0 Fixed CoreProtect not recognizing Slimefun blocks getting broken 2020-11-19 13:11:30 +01:00
TheBusyBiscuit
64fd5a54c3 Added an item setting to configure the Wind Staff velocity 2020-11-19 12:49:42 +01:00
TheBusyBiscuit
a18317295a [CI skip] Refactoring 2020-11-19 12:45:35 +01:00
wzpzw5
024dbf4fc5
Update BlockPlacer.java 2020-11-18 01:37:54 +00:00
wzpzw5
d76f77cd84
Update BlockPlacer.java 2020-11-18 01:21:59 +00:00
TheBusyBiscuit
e4624c4474
[CI skip] Merge pull request #2556 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.158
2020-11-17 12:10:58 +01:00
Renovate Bot
05c7a656b2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.158 2020-11-17 01:38:30 +00:00
wzpzw5
965e348695
Update BlockPlacer.java 2020-11-17 01:13:03 +00:00
wzpzw5
3db77a0081
Fixed a bug of Duplicate items with BlockPlacer
Fixed a bug of Duplicate items with BlockPlacer's delay
on BlockPlacer place an item, just take out the item when it place,then one in hand and 
another is placed
2020-11-17 00:01:04 +00:00
TheBusyBiscuit
0cdd21f6bb Added a config option to delete excess cargo network items 2020-11-15 16:29:45 +01:00
TheBusyBiscuit
adc36fe7bd
[CI skip] Merge pull request #2553 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.1
2020-11-15 14:10:43 +01:00
Renovate Bot
0fd952d9e5
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.1 2020-11-15 10:54:53 +00:00
TheBusyBiscuit
0b9ab8b6cc Fixes #2446 2020-11-14 18:44:07 +01:00
TheBusyBiscuit
503dbc8367 Fixes #2418 2020-11-14 18:32:53 +01:00
TheBusyBiscuit
8de60dbe1d
[CI skip] Merge pull request #2552 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27
2020-11-14 18:12:10 +01:00
Renovate Bot
2cd1fa2019
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27 2020-11-14 16:38:22 +00:00
CURVX
527dfb2b79 Been a while 2020-11-12 22:20:36 +05:30
CURVX
c4a08fe991 Changes req by TTB 2020-11-12 18:32:18 +05:30
CURVX
bd461a6f88
Merge pull request #5 from Slimefun/master
[CI skip] Update fork
2020-11-12 18:10:00 +05:30
TheBusyBiscuit
032ad956ad
[CI skip] Merge pull request #2551 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.157
2020-11-12 12:46:16 +01:00
Renovate Bot
9c70c91118
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.157 2020-11-12 01:45:59 +00:00
TheBusyBiscuit
48b548e432
[CI skip] Merge pull request #2549 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.156
2020-11-11 11:47:25 +01:00
Renovate Bot
a6c8f3cf6c
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.156 2020-11-10 23:40:26 +00:00
TheBusyBiscuit
a675fe74f3
[CI skip] Merge pull request #2547 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.155
2020-11-10 11:08:47 +01:00
Renovate Bot
c243dd6927
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.155 2020-11-10 01:55:24 +00:00
TheBusyBiscuit
f1d4b50b67 One more tweak 2020-11-10 01:09:50 +01:00
TheBusyBiscuit
97cbe72a91 Some tweaks to the experimental bee wings 2020-11-10 01:04:15 +01:00