TheBusyBiscuit
|
1520e71107
|
Updated translators
|
2020-06-25 22:51:56 +02:00 |
|
LinoxGH
|
1a8ff9c511
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange
|
2020-06-25 22:16:49 +03:00 |
|
LinoxGH
|
e016ea1180
|
Explosive Bow Functionality Changed.
Explosive Bow now deals an area of effect.
|
2020-06-25 22:13:24 +03:00 |
|
TheBusyBiscuit
|
d18af0c211
|
Ore Crusher now also accepts Nether Gold Ore
|
2020-06-25 15:27:18 +02:00 |
|
TheBusyBiscuit
|
427a312240
|
More steps towards 1.16 compatibility (unfinished)
|
2020-06-25 14:43:17 +02:00 |
|
TheBusyBiscuit
|
92e7e58915
|
Merge branch 'master' into support/1.16
|
2020-06-25 13:40:28 +02:00 |
|
TheBusyBiscuit
|
3b7ad0ac63
|
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix
Auto Drier 1.13 Update
|
2020-06-25 13:27:50 +02:00 |
|
LinoxGH
|
f9c8cd1d76
|
Fixed the recipe.
|
2020-06-25 14:08:57 +03:00 |
|
LinoxGH
|
82b9de4c54
|
Fixed merge conflict.
|
2020-06-25 13:38:30 +03:00 |
|
LinoxGH
|
7e20e7cd9f
|
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
|
2020-06-25 13:37:33 +03:00 |
|
Daniel Walsh
|
81e16a6c47
|
1.16 support
|
2020-06-25 06:05:17 +01:00 |
|
SoSeDiK
|
ecd97b3e50
|
Fixed a tiny typo
|
2020-06-25 05:54:21 +03:00 |
|
TheBusyBiscuit
|
a36c42959e
|
Some refactoring of PR #2020
|
2020-06-25 00:21:43 +02:00 |
|
LinoxGH
|
3cba1f71fc
|
Fixed an issue created by another pr.
|
2020-06-24 22:46:02 +03:00 |
|
LinoxGH
|
8f0c5100d4
|
Merge branch 'master' into AutoBrewer
|
2020-06-24 22:38:15 +03:00 |
|
LinoxGH
|
4249a2b85b
|
Did the requested changes.
|
2020-06-24 22:33:55 +03:00 |
|
TheBusyBiscuit
|
c64b311ee2
|
Finished merge of PR #2015 and updated language keys
|
2020-06-24 21:25:21 +02:00 |
|
LinoxGH
|
776dc2a302
|
Added some documentation.
|
2020-06-24 22:17:01 +03:00 |
|
TheBusyBiscuit
|
cccc8f2162
|
[CI skip] Merge pull request #2015 from LinoxGH/master
Added Magic Pills. The Edited Version
|
2020-06-24 21:11:30 +02:00 |
|
TheBusyBiscuit
|
2424a2ceab
|
[CI skip] Refactoring
|
2020-06-24 20:50:53 +02:00 |
|
LinoxGH
|
841b2003bb
|
Added 1.13 compability for auto drier.
|
2020-06-24 21:33:22 +03:00 |
|
LinoxGH
|
daadabd535
|
Fixed an import dis-organisation.
|
2020-06-24 21:25:42 +03:00 |
|
LinoxGH
|
4f6bbafdfc
|
Added Auto Brewer.
A new medium machine that can create potions automatically.
|
2020-06-24 21:24:16 +03:00 |
|
TheBusyBiscuit
|
6840a1e957
|
Updated assets
|
2020-06-24 18:57:12 +02:00 |
|
TheBusyBiscuit
|
d3f1dc6fb3
|
Fixes #1855 plus a few optimizations
|
2020-06-24 18:50:39 +02:00 |
|
TheBusyBiscuit
|
8d373a3812
|
Minor changes
|
2020-06-24 14:54:43 +02:00 |
|
LinoxGH
|
573068283a
|
Added the support for 1.13
|
2020-06-24 01:17:14 +03:00 |
|
LinoxGH
|
3278457441
|
Did the requested changes.
|
2020-06-24 01:06:48 +03:00 |
|
LinoxGH
|
9205b143ed
|
Added Magic Pills.
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
|
2020-06-23 21:11:08 +03:00 |
|
TheBusyBiscuit
|
1c50d29fa8
|
Added Nether Quartz Ore Crusher Recipe
|
2020-06-22 22:49:07 +02:00 |
|
TheBusyBiscuit
|
bab94652bc
|
Duplication glitch fix and performance improvements for Rainbow blocks
|
2020-06-22 22:45:14 +02:00 |
|
TheBusyBiscuit
|
bdb25b74ec
|
Changed the texture of the Nether Star Reactor
|
2020-06-22 14:22:41 +02:00 |
|
TheBusyBiscuit
|
7d8ef33d78
|
Changed the texture for the Nuclear Reactor
|
2020-06-22 12:07:56 +02:00 |
|
TheBusyBiscuit
|
a06e49cf13
|
Improvements to error logging in world loading
|
2020-06-22 01:55:11 +02:00 |
|
TheBusyBiscuit
|
f8182e4e3b
|
Fixed Infused Magnet working even if you haven't researched it
|
2020-06-21 19:51:34 +02:00 |
|
TheBusyBiscuit
|
8e07ada321
|
Reduced technical debt / Refactoring
|
2020-06-21 10:26:54 +02:00 |
|
TheBusyBiscuit
|
24cea8dade
|
Further Improvements on the backwards-compatibility toggle
|
2020-06-20 21:39:41 +02:00 |
|
TheBusyBiscuit
|
c98aca37f1
|
Massive Performance improvements to GEO-Miner and Oil Pump
|
2020-06-20 19:33:37 +02:00 |
|
TheBusyBiscuit
|
4b38dd655d
|
Added ReactorExplodeEvent to the API
|
2020-06-20 19:21:44 +02:00 |
|
TheBusyBiscuit
|
907fb1566a
|
Fixes #2009
|
2020-06-20 18:52:30 +02:00 |
|
TheBusyBiscuit
|
1456245ee0
|
Added a toggle for backwards compatibility
|
2020-06-20 11:56:29 +02:00 |
|
TheBusyBiscuit
|
7059ad216c
|
Refactoring and general improvements
|
2020-06-19 13:22:52 +02:00 |
|
TheBusyBiscuit
|
3c3dd48e9b
|
Fixes #2005
|
2020-06-18 21:15:47 +02:00 |
|
TheBusyBiscuit
|
33db9151d6
|
Lots of refactoring and clean up
|
2020-06-17 14:56:48 +02:00 |
|
TheBusyBiscuit
|
5c14bc5cbe
|
Refactoring
|
2020-06-17 01:24:47 +02:00 |
|
TheBusyBiscuit
|
f0b5d55c48
|
Reduced technical debt
|
2020-06-16 15:40:05 +02:00 |
|
TheBusyBiscuit
|
e82acc0b3c
|
Refactoring
|
2020-06-16 15:36:44 +02:00 |
|
TheBusyBiscuit
|
314907eb82
|
A ton of refactoring
|
2020-06-16 14:16:21 +02:00 |
|
TheBusyBiscuit
|
c77a2c2997
|
Did some long overdue refactoring
|
2020-06-16 01:54:18 +02:00 |
|
TheBusyBiscuit
|
d628f8586f
|
Really really big refactoring and deprecation
|
2020-06-16 01:16:14 +02:00 |
|
TheBusyBiscuit
|
ffa3ea1c1b
|
Further improvements to Unit Tests
|
2020-06-15 15:01:33 +02:00 |
|
TheBusyBiscuit
|
944c009afb
|
[CI skip] Added Unit Tests for GEO Resources
|
2020-06-15 13:29:15 +02:00 |
|
TheBusyBiscuit
|
4efc10db15
|
Fixes #1907
|
2020-06-15 11:53:38 +02:00 |
|
TheBusyBiscuit
|
c84dd02b39
|
Fixes #1993
|
2020-06-14 19:28:51 +02:00 |
|
TheBusyBiscuit
|
4855f0da86
|
Androids now have a seperate category
|
2020-06-14 18:58:38 +02:00 |
|
TheBusyBiscuit
|
2bead0cd3d
|
Maybe fixes #1951
|
2020-06-14 13:34:31 +02:00 |
|
TheBusyBiscuit
|
2733b8a17b
|
Fixes #1992 and changes to the fishing loot for androids
|
2020-06-14 13:01:38 +02:00 |
|
TheBusyBiscuit
|
cf24923e9c
|
Fixes #1985
|
2020-06-14 02:39:01 +02:00 |
|
TheBusyBiscuit
|
85af23c17c
|
Fixes #1988
|
2020-06-14 02:36:32 +02:00 |
|
TheBusyBiscuit
|
debc925bd0
|
Fixes #1976
|
2020-06-13 21:24:28 +02:00 |
|
TheBusyBiscuit
|
e3dc17a9df
|
[CI skip] Reduced technical debt
|
2020-06-13 13:52:53 +02:00 |
|
TheBusyBiscuit
|
4dbc66fc4e
|
[CI skip] More refactoring
|
2020-06-13 13:05:22 +02:00 |
|
TheBusyBiscuit
|
872c83f1a6
|
[CI skip] Updated translators
|
2020-06-13 10:21:15 +02:00 |
|
TheBusyBiscuit
|
7baa3cb81b
|
[CI skip] Reduced technical debt
|
2020-06-13 10:15:18 +02:00 |
|
TheBusyBiscuit
|
e45764ade1
|
Refactored a bunch of android-related things
|
2020-06-13 01:50:48 +02:00 |
|
TheBusyBiscuit
|
e7b7061b56
|
Added further documentation
|
2020-06-13 01:08:42 +02:00 |
|
TheBusyBiscuit
|
62ffb59ba2
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-06-13 01:02:39 +02:00 |
|
Josh
|
0b4904831b
|
update
|
2020-06-12 18:52:54 -04:00 |
|
Josh
|
a232d82851
|
add check
|
2020-06-12 18:10:06 -04:00 |
|
Josh
|
5f8ae4b182
|
don't get it twice
|
2020-06-12 18:04:55 -04:00 |
|
Josh
|
e989969713
|
safety check in CustomItemDataService
|
2020-06-12 18:01:19 -04:00 |
|
Josh
|
56bd432719
|
check if null in getItemMeta
|
2020-06-12 17:29:04 -04:00 |
|
Josh
|
6bc28d6b69
|
allow null meta
|
2020-06-12 17:09:57 -04:00 |
|
TheBusyBiscuit
|
b304ce14e1
|
[CI skip] Added lots more unit tests, some will be skipped
|
2020-06-12 19:18:29 +02:00 |
|
TheBusyBiscuit
|
9b2c378c3a
|
[CI skip] Refactored unit tests
|
2020-06-12 18:55:09 +02:00 |
|
TheBusyBiscuit
|
c5cc2a86ff
|
[CI skip] Refactoring and optimizations
|
2020-06-11 13:50:22 +02:00 |
|
TheBusyBiscuit
|
79e8ca46ff
|
Another small optimization
|
2020-06-11 11:42:24 +02:00 |
|
TheBusyBiscuit
|
aeab6df103
|
Small performance improvements for cargo networks
|
2020-06-11 10:08:08 +02:00 |
|
TheBusyBiscuit
|
25d970ea94
|
Fixes #1971
|
2020-06-11 09:34:29 +02:00 |
|
TheBusyBiscuit
|
5c20d3b470
|
Merge pull request #1963 from siaynoq/gold-ingot-pulverize
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
|
2020-06-11 00:43:49 +02:00 |
|
TheBusyBiscuit
|
f58d6aeff4
|
Small performance improvement
|
2020-06-11 00:43:17 +02:00 |
|
Siaynoq
|
1156cb33c0
|
Removed unneeded construction of GOLD_DUST
|
2020-06-11 08:33:37 +10:00 |
|
Siaynoq
|
5bf4604026
|
Removed unneeded array objects
|
2020-06-11 08:05:50 +10:00 |
|
TheBusyBiscuit
|
7acee959ce
|
Lots of refactoring
|
2020-06-10 23:33:51 +02:00 |
|
TheBusyBiscuit
|
22650f53dd
|
[Ci skip] Refactoring
|
2020-06-10 21:26:28 +02:00 |
|
TheBusyBiscuit
|
dc592605d6
|
[Ci skip] Fixed javadoc warning
|
2020-06-10 17:51:02 +02:00 |
|
TheBusyBiscuit
|
316d70ecc6
|
[CI skip] Added Unit Tests for /sf backpack
|
2020-06-10 17:48:00 +02:00 |
|
TheBusyBiscuit
|
9eb22db6de
|
[CI skip] Added more Unit Tests
|
2020-06-10 17:33:14 +02:00 |
|
TheBusyBiscuit
|
da7291995b
|
[CI skip] Added some Unit Tests for commands
|
2020-06-10 17:11:28 +02:00 |
|
Siaynoq
|
c44730c589
|
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
|
2020-06-10 14:06:03 +10:00 |
|
TheBusyBiscuit
|
b659e51008
|
Merge pull request #1953 from TheBusyBiscuit/feature/miner
Added Industrial Miner & Removed Digital Miner
|
2020-06-09 23:23:56 +02:00 |
|
TheBusyBiscuit
|
d645fcc75b
|
[CI skip] Updated translators list
|
2020-06-09 23:23:02 +02:00 |
|
TheBusyBiscuit
|
df947e0967
|
[CI skip] Refactoring
|
2020-06-09 23:21:37 +02:00 |
|
TheBusyBiscuit
|
013696a759
|
Merge branch 'master' into feature/miner
|
2020-06-09 00:12:33 +02:00 |
|
TheBusyBiscuit
|
4f7b06be4c
|
Changes to organic food/fertilizer
|
2020-06-09 00:10:32 +02:00 |
|
TheBusyBiscuit
|
abe8afab67
|
More balancing for Organic Food/Fertilizer
|
2020-06-08 23:25:45 +02:00 |
|
TheBusyBiscuit
|
bd712472d5
|
Balancing changes to Organic Food/Fertilizer, added cocoa variant
|
2020-06-08 23:13:44 +02:00 |
|
TheBusyBiscuit
|
70738a45ee
|
Refactored recipe service for electric furnaces
|
2020-06-08 14:20:01 +02:00 |
|
TheBusyBiscuit
|
615e0c07a2
|
Minor changes
|
2020-06-07 17:48:10 +02:00 |
|
TheBusyBiscuit
|
586a6970ed
|
Updated translator list
|
2020-06-05 18:18:18 +02:00 |
|
TheBusyBiscuit
|
8bde659daf
|
The Advanced Miner now preserves buckets
|
2020-06-05 14:34:24 +02:00 |
|
TheBusyBiscuit
|
cd79775402
|
Added Advanced Industrial Miner
|
2020-06-05 14:13:53 +02:00 |
|
TheBusyBiscuit
|
e41eca9caa
|
Refactoring
|
2020-06-05 14:09:32 +02:00 |
|
TheBusyBiscuit
|
4f21fd03bc
|
Finished Industrial Miner
|
2020-06-05 00:21:45 +02:00 |
|
TheBusyBiscuit
|
c8f78379a1
|
Added Industrial Miner
|
2020-06-05 00:00:07 +02:00 |
|
TheBusyBiscuit
|
4664fb00fe
|
Added back researches
|
2020-06-04 23:59:58 +02:00 |
|
TheBusyBiscuit
|
aebd03301d
|
Added new ItemStacks
|
2020-06-04 23:56:08 +02:00 |
|
TheBusyBiscuit
|
7e8a63bff8
|
Dried Kelp Blocks are now valid coal generator fuel
|
2020-06-04 15:26:35 +02:00 |
|
TheBusyBiscuit
|
968b3df10a
|
Relocated Multiblock class
|
2020-06-03 09:51:51 +02:00 |
|
TheBusyBiscuit
|
31a9b69651
|
Refactored Backpacks
|
2020-06-02 13:58:03 +02:00 |
|
TheBusyBiscuit
|
595767ad03
|
Some cleanup
|
2020-06-02 13:50:29 +02:00 |
|
TheBusyBiscuit
|
0faaef9b25
|
Removed Digital Miners
|
2020-06-01 14:10:22 +02:00 |
|
TheBusyBiscuit
|
2f09470b51
|
[Ci skip] Reduced technical debt
|
2020-06-01 13:52:04 +02:00 |
|
PhanaticD
|
dc351f51ad
|
remove metadata on entity death, and when items are removed from pedestal. Also remove references to "item_placed" I do not see anywhere where this key is actually set, maybe leftover from old code?
|
2020-06-01 01:19:41 -04:00 |
|
TheBusyBiscuit
|
4bb81c0f5f
|
Updated changelog
|
2020-05-31 00:38:19 +02:00 |
|
TheBusyBiscuit
|
c85b29c009
|
Fixes #1943
|
2020-05-30 16:21:13 +02:00 |
|
TheBusyBiscuit
|
5378341839
|
[Ci skip] Refactoring and proper deprecation of the HandledBlock class
|
2020-05-30 14:53:29 +02:00 |
|
TheBusyBiscuit
|
343a18a95d
|
Added dried Kelp and bone block recipes to the Electric Press
|
2020-05-30 13:36:48 +02:00 |
|
TheBusyBiscuit
|
929f26d103
|
[CI skip] Reduced technical debt
|
2020-05-30 13:21:17 +02:00 |
|
TheBusyBiscuit
|
d19da209d5
|
Fixes #1942
|
2020-05-29 16:07:02 +02:00 |
|
TheBusyBiscuit
|
efd9903ace
|
[CI skip] Refactoring
|
2020-05-29 12:07:24 +02:00 |
|
TheBusyBiscuit
|
6ca1f7dca9
|
[Ci skip] Removed deprecated stuff
|
2020-05-29 01:39:21 +02:00 |
|
TheBusyBiscuit
|
7039eb1312
|
[skip] Removed weird line breaks und updated translator list
|
2020-05-28 12:47:01 +02:00 |
|
TheBusyBiscuit
|
982a07262e
|
Another relocation
|
2020-05-26 10:21:58 +02:00 |
|
TheBusyBiscuit
|
4af26f3b00
|
[Ci skip] Added some more basic tests
|
2020-05-26 09:57:45 +02:00 |
|
TheBusyBiscuit
|
1b951f77ea
|
[CI skip] Added an extremely simple ResearchSetup test
|
2020-05-25 12:58:01 +02:00 |
|
TheBusyBiscuit
|
a34abcb1e7
|
Some refactoring, also fixes #1935
|
2020-05-24 20:19:22 +02:00 |
|
TheBusyBiscuit
|
7ae16f8358
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-05-24 19:13:03 +02:00 |
|
TheBusyBiscuit
|
f38c895780
|
[CI skip] Updated MockBukkit and re-enabled Deathpoint tests
|
2020-05-24 19:12:45 +02:00 |
|
bito-blosh
|
aab6624ce0
|
Fixed android ATTACK part deals wrong damage
|
2020-05-24 15:39:48 +09:00 |
|
TheBusyBiscuit
|
23c2ab0f65
|
Fixed custom player heads errors
|
2020-05-24 01:57:38 +02:00 |
|
TheBusyBiscuit
|
6a4e23853c
|
Added more Unit Tests
|
2020-05-24 01:48:42 +02:00 |
|
TheBusyBiscuit
|
0af8c41eeb
|
Added a toggle for #1924 and fixes #1933
|
2020-05-24 01:11:10 +02:00 |
|
TheBusyBiscuit
|
efcc9c1a4b
|
[CI skip] Refactoring
|
2020-05-24 00:49:27 +02:00 |
|
TheBusyBiscuit
|
323ddc949b
|
Fixes #1926
|
2020-05-23 20:34:37 +02:00 |
|
TheBusyBiscuit
|
a96f85ece4
|
[CI skip] Coverage ahoy!
|
2020-05-23 20:18:43 +02:00 |
|
TheBusyBiscuit
|
a6a4a0a671
|
[CI skip] Infrastructure for further Unit Testing
|
2020-05-22 18:01:25 +02:00 |
|
TheBusyBiscuit
|
902367de0c
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-05-22 16:40:33 +02:00 |
|
TheBusyBiscuit
|
de93daf9be
|
[CI skip] Updated MockBukkit
|
2020-05-22 16:40:26 +02:00 |
|
TheBusyBiscuit
|
c51ff84640
|
Merge pull request #1925 from WalshyDev/fix/walshys-fixes
Add a way to reload BlockMenu
|
2020-05-22 16:36:52 +02:00 |
|
Daniel Walsh
|
9ddbaf70cd
|
So... I can't test this
|
2020-05-22 15:02:26 +01:00 |
|
Daniel Walsh
|
984a96bcb5
|
REEE I can't sleep 😢
|
2020-05-22 14:42:28 +01:00 |
|
TheBusyBiscuit
|
a94da8a372
|
[Ci skip] Removed unused imports
|
2020-05-22 12:19:40 +02:00 |
|
Daniel Walsh
|
8db67af455
|
Requested pickiness
|
2020-05-22 10:28:21 +01:00 |
|
Daniel Walsh
|
3048f0f6a0
|
Unit tests save the day
|
2020-05-22 07:11:58 +01:00 |
|
Daniel Walsh
|
f269c37f76
|
Add build num to UpdaterService
|
2020-05-22 07:08:17 +01:00 |
|
Daniel Walsh
|
fffd9921b3
|
Doc
|
2020-05-22 06:51:39 +01:00 |
|
Daniel Walsh
|
f049a75006
|
Add a way to reload menus
|
2020-05-22 06:43:02 +01:00 |
|
FabioZumbi12
|
7a6e6cd8eb
|
Missing space on line
|
2020-05-22 01:13:59 -03:00 |
|
FabioZumbi12
|
d1a968d4ff
|
Changed to Block explode, and added the event to Explosive Shovel
|
2020-05-22 01:07:20 -03:00 |
|