TheBusyBiscuit
92ca696140
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
...
into experimental
Conflicts:
CHANGELOG.md
2020-07-25 14:27:12 +02:00
TheBusyBiscuit
42c57f8907
[CI skip] Small change
2020-07-25 14:19:09 +02:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097
...
Fixed piglin SlimefunItem pickup
2020-07-25 13:56:58 +02:00
poma123
dde3ec26ba
Requested changes
2020-07-25 13:51:10 +02:00
poma123
a323b09e38
Fixed a tremendous mistake
2020-07-25 13:41:11 +02:00
poma123
5ff93b75e0
Added PiglinListener
2020-07-25 13:37:04 +02:00
poma123
a6d69ee9d6
Requested changes
2020-07-25 12:31:52 +02:00
TheBusyBiscuit
33f7c42e2c
Added an option to disable the "Ignoring duplicate block" message
2020-07-25 12:28:04 +02:00
poma123
17a68ddcf5
Removed unnecessary Zombified Piglin check
2020-07-25 12:19:02 +02:00
poma123
9fb79c8622
Fixed piglin SlimefunItem pickup
2020-07-25 12:04:22 +02:00
TheBusyBiscuit
abc47af565
Fixed exception handling
2020-07-24 19:11:38 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental
2020-07-24 16:36:08 +02:00
TheBusyBiscuit
47be5f16ce
[CI skip] Refactoring, also removed more deprecated things
2020-07-24 16:33:09 +02:00
TheBusyBiscuit
388300f25b
Merge pull request #2117 from kylehassall27/CrushCompressedCoal
...
Add recipes to crush compressed carbon into carbon and carbon into coal
2020-07-24 16:15:59 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module
...
Metrics!
2020-07-24 16:06:53 +02:00
KykyRocks1
dca5348aae
Added recipes to crush compressed carbon into carbon and carbon into coal
2020-07-23 15:56:44 -04:00
TheBusyBiscuit
1f7b75b823
Added Iron Golem Assembler (experimental)
2020-07-23 12:02:53 +02:00
Daniel Walsh
b13776d729
Final changes
2020-07-23 10:37:23 +01:00
Daniel Walsh
6f92bd6c28
Requested changes
2020-07-23 09:51:35 +01:00
TheBusyBiscuit
ee62a9b004
Optimized Enhanced Furnaces for Paper and fixes #1894
2020-07-23 01:23:03 +02:00
TheBusyBiscuit
916fb554d0
Fixes #2086
2020-07-23 00:52:59 +02:00
Daniel Walsh
d547d61151
Requested changes
2020-07-22 20:45:55 +01:00
TheBusyBiscuit
ba4282c3e7
[CI skip] Merge pull request #2109 from WalshyDev/change/some-small-changes
...
Fix some regex, finals and replace isPresent with ifPresent
2020-07-22 21:23:20 +02:00
TheBusyBiscuit
8c867c09b6
[CI skip] Some documentation
2020-07-22 21:17:25 +02:00
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module
2020-07-22 20:43:39 +02:00
Daniel Walsh
5e3eccfaa4
Fix some regex, finals and replace isPresent with ifPresent
2020-07-22 18:06:42 +01:00
TheBusyBiscuit
d2754f06fc
[CI skip] A bit refactoring
2020-07-22 18:11:43 +02:00
Daniel Walsh
2646eba615
Small change
2020-07-21 14:51:04 +01:00
Daniel Walsh
52a3cbae41
Merge master
2020-07-21 13:57:40 +01:00
Poma123
5fa4e8b083
Added BONE_BLOCK to GrindStone
2020-07-21 13:51:08 +02:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental
2020-07-21 10:18:34 +02:00
TheBusyBiscuit
6eebb79314
Fixed
2020-07-21 09:56:29 +02:00
Daniel Walsh
58dbbd8944
Better handling of downloaded files, typo fix and small changes
2020-07-21 08:47:36 +01:00
Daniel Walsh
d31a293486
Requested changes
2020-07-20 16:04:49 +01:00
Daniel Walsh
d252e5a2b5
final final final small thing
2020-07-20 15:51:32 +01:00
Daniel Walsh
4d61a7db51
Reshade stupid bStats
2020-07-20 15:47:22 +01:00
Daniel Walsh
8da64ab308
Moved the metric class
2020-07-20 15:35:31 +01:00
Daniel Walsh
50f034b3e3
Documentation
2020-07-20 15:31:32 +01:00
TheBusyBiscuit
29b26ed327
Made requested changes
2020-07-20 16:30:20 +02:00
Daniel Walsh
fb40bffdce
Small change
2020-07-20 15:17:24 +01:00
Daniel Walsh
55041e81b1
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module
2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e
Oh baby, this is a big one
2020-07-20 15:15:21 +01:00
TheBusyBiscuit
397f194029
Fixed two synchronization issues
2020-07-20 13:08:13 +02:00
TheBusyBiscuit
fd10f2ea4c
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into paper
2020-07-20 12:48:25 +02:00
TheBusyBiscuit
eb9466c41d
Added a research for the Tape Measure (experimental)
2020-07-20 12:47:13 +02:00
TheBusyBiscuit
4e0df92b56
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
...
into experimental
Conflicts:
CHANGELOG.md
src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-07-20 12:46:12 +02:00
TheBusyBiscuit
613bcd86b8
Fixes #2093
2020-07-20 12:43:05 +02:00
TheBusyBiscuit
f4c0c9f905
Minor changes
2020-07-20 10:49:59 +02:00
TheBusyBiscuit
64b59e3a02
Spigot is now called "Spigot"
2020-07-20 03:05:49 +02:00
TheBusyBiscuit
c1d6021216
Optimized teleportations
2020-07-20 02:31:58 +02:00
TheBusyBiscuit
045cdf1090
Added performance improvements for Block States
2020-07-20 02:22:24 +02:00
TheBusyBiscuit
ae780a69bb
Added PaperLib
2020-07-20 01:51:14 +02:00
TheBusyBiscuit
14e062810b
Fixes #2075
2020-07-19 10:53:09 +02:00
TheBusyBiscuit
8042deb591
Some small improvements
2020-07-19 10:31:12 +02:00
TheBusyBiscuit
c78e3c3959
Performance improvements for cargo (when ChestTerminals is installed)
2020-07-16 22:41:36 +02:00
TheBusyBiscuit
75ca7f1d4b
Cargo performance improvement
2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305
Relocated a class
2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58
More refactoring
2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705
Refactoring
2020-07-15 18:50:26 +02:00
TheBusyBiscuit
d26eed4534
Removed redundant check
2020-07-15 18:46:17 +02:00
TheBusyBiscuit
72e1cc33bb
Minor change
2020-07-15 18:23:57 +02:00
TheBusyBiscuit
eaaf0c5c01
Another performance improvement to Energy networks
2020-07-15 18:23:21 +02:00
TheBusyBiscuit
f14ec8dc99
Missed one line
2020-07-15 13:20:47 +02:00
TheBusyBiscuit
45c01df9dc
Updated to latest Spigot API methods
2020-07-15 13:19:51 +02:00
TheBusyBiscuit
c574337318
Reworked Energy Providers (Generators)
2020-07-15 13:17:27 +02:00
TheBusyBiscuit
50c579b7d6
Added a Tape Measure to the experimental branch
2020-07-13 11:55:59 +02:00
TheBusyBiscuit
f5db4bf695
Merge branch 'master'
2020-07-13 10:42:47 +02:00
TheBusyBiscuit
5c159b4247
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
...
into experimental
Conflicts:
CHANGELOG.md
src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
2020-07-13 10:41:53 +02:00
TheBusyBiscuit
9af908300f
Fixed a NullPointerException for Error-Reports for generators
2020-07-12 13:19:16 +02:00
TheBusyBiscuit
058f34879a
Moved the Soulbound Backpack to "Magical Gadgets"
2020-07-10 18:02:51 +02:00
TheBusyBiscuit
8fd0afd8bd
Fixes #2081
2020-07-09 18:35:48 +02:00
TheBusyBiscuit
4dcc73bbf8
Fixed javadocs
2020-07-09 13:58:04 +02:00
TheBusyBiscuit
c9c760836e
Another class relocation
2020-07-09 12:43:26 +02:00
TheBusyBiscuit
c2b0121a07
More refactoring
2020-07-08 13:32:19 +02:00
TheBusyBiscuit
c516cab263
Some refactoring and small optimizations
2020-07-08 11:26:44 +02:00
TheBusyBiscuit
0984afb3c6
Post-PR refactoring
2020-07-07 10:54:32 +02:00
TheBusyBiscuit
f304406aa8
[CI skip] Merge pull request #2071 from dniym/ChanceDrop
...
Added Chance Drop for MOB_DROP recipe items. References #980
2020-07-07 10:28:51 +02:00
dniym
367dd8c914
Negated isDroppedFromGolems
2020-07-06 22:28:41 -04:00
dniym
371b283d21
Replaced Tabs with Spaces as requested
2020-07-06 19:19:13 -04:00
TheBusyBiscuit
afd63a1f51
Small performance optimization for large Cargo networks
2020-07-06 22:04:32 +02:00
dniym
43b48b4b3d
Made Requested Changes
2020-07-05 16:54:27 -04:00
dniym
96b4394d7f
Made requested changes
2020-07-05 16:45:08 -04:00
dniym
b3f801d84e
Made requested changes
2020-07-05 12:35:40 -04:00
dniym
645d73d0ef
Made requested changes.
2020-07-05 10:40:07 -04:00
TheBusyBiscuit
b243f128de
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2020-07-05 15:07:32 +02:00
TheBusyBiscuit
098304a1c4
Implemented a texture cache for contributors
2020-07-05 15:07:28 +02:00
TheBusyBiscuit
3408fcf11f
Updated assets
2020-07-05 14:39:28 +02:00
TheBusyBiscuit
e3a920826d
One more change
2020-07-05 13:30:13 +02:00
TheBusyBiscuit
6a950fe8d6
Fixed lore
2020-07-05 13:06:13 +02:00
TheBusyBiscuit
b01254eb9d
Added Reinforced Cloth
2020-07-05 13:01:17 +02:00
TheBusyBiscuit
74cf035709
Fixed a NullPointerException
2020-07-05 12:13:03 +02:00
TheBusyBiscuit
9426ebb2e9
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
...
into experimental
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
2020-07-05 12:08:30 +02:00
TheBusyBiscuit
88dfdfa560
Small improvement to Cargo performance
2020-07-05 12:04:40 +02:00
TheBusyBiscuit
4edc557547
Fixed an issue where moving Androids got stuck
2020-07-05 11:46:20 +02:00
TheBusyBiscuit
7d901744fd
Small improvement
2020-07-04 19:15:13 +02:00
TheBusyBiscuit
5a19b18633
Thunderstorms now count as night for Solar Generators (+ other stuff)
2020-07-04 19:04:29 +02:00
dniym
27149ee514
Fixed formatting error
2020-07-04 09:42:17 -04:00
dniym
aca5b6efc5
Removed unused import
2020-07-04 09:39:13 -04:00
dniym
f80bada54b
Made Requested Changes
2020-07-04 09:36:29 -04:00
dniym
1ddd763dbf
Added Chance Drop for MOB_DROP recipe items. References #980
...
Added interface for ChanceDrop items
Added a check for chance drop items in the EntityDeathListener
Adjusted circuit board to have a 75% chance rather than 100% chance
2020-07-03 23:19:19 -04:00