1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

1623 Commits

Author SHA1 Message Date
TheBusyBiscuit
cdef18c8d7 [CI skip] Little improvement 2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba [CI skip] Some minor changes to metrics 2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2 [CI skip] Added two more contributor names, some refactoring 2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f Optimized item check 2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java 2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID
Changed NETHER_QUARTZ to QUARTZ.
2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.

https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
2019-12-09 16:50:25 +01:00
TheBusyBiscuit
6c4c9cdc17 Some minor optimization 2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8 Removed unnecessary action 2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236 Tweaked instant researching
Don't start researching when it's instant, just throw fireworks & message about completion
2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e Reworked Knowledge Tome 2019-12-08 22:45:03 +02:00
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02:00
SoSeDiK
9b5bcfde44 Updated Crucible's mechanics 2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459 Improved SlimefunItemStack#clone() 2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974 Another optimization 2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8 Item optimizations 2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8 Optimized items even further 2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff Optimized SlimefunManager.isItemSimilar 2019-12-08 12:58:05 +01:00
TheBusyBiscuit
4699d6b94d [Ci skip] Another little change 2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2 [Ci skip] Some small changes 2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors
Allow for different GH and MC names + small improvements
2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java 2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java 2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java 2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java 2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092 Added @NihilistBrew 2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident 2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67 Added Nether Gold Pan to the Electric Gold Pan 2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f [CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283)
* Update TeleportationSequence.java

* Update TeleportationSequence.java

* Update Elevator.java
2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe Revert 5b9e9a4fb7 2019-12-06 21:47:18 +00:00
Daniel Walsh
5b9e9a4fb7 *screams internally* 2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef Add ajan-12 and LinoxGH 2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa oops, revert dis 2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204 Pasting is a true gem 2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f Fixed up
Now doesn't accept special chars and added imgbot
2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42 Allow for different GH and MC names + small improvements 2019-12-06 20:08:20 +00:00
TheBusyBiscuit
a29016a391
[CI skip] Added more wiki entries 2019-12-06 14:41:01 +01:00
TheBusyBiscuit
bcbe16253e Search now shows the Category of an Item 2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280 2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor
Allows using the new item system.
2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6 Fixed Output Chest 2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4 Fixed blocks turning into CSCoreLib heads for all newly placed
non-ticking blocks.
2019-12-03 20:20:33 +01:00
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1
AndroidMineEvent
2019-12-03 00:37:23 +01:00
J3fftw1
c2230f1763 fixes dupe with geominer 2019-12-02 23:14:22 +01:00
poma123
1ddd46768e Changed android getter & updated javadocs 2019-12-02 16:21:55 +01:00
J3fftw1
5e52a5d3ab actually fixes it now
removed if (list.size() % 2 != 0) list.add(null);
2019-12-02 15:58:33 +01:00
poma123
426dd64a2b Added android getter and some javadocs 2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af Fixes #1269 2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429 Fixed IllegalArgumentException for second-page credits 2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536 [CI skip] Minor UI change 2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd Fixed credits now showing everyone 2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5 Added Electric Press 2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6 Fixed guide showing incomplete recipes for some machines 2019-12-01 18:59:14 +01:00
TheBusyBiscuit
20cdda2845 Fixed multi tools again 2019-12-01 18:42:33 +01:00
TheBusyBiscuit
3a608cfe4f Fixed multi tools 2019-12-01 18:39:37 +01:00
TheBusyBiscuit
accb018b22 Reduced a bit more technical debt 2019-12-01 18:37:43 +01:00
TheBusyBiscuit
b4faad9a72 Reduced technical debt on MultiTools 2019-12-01 18:35:15 +01:00
TheBusyBiscuit
b5cc48fd9b Changed Grappling Hook Recipe 2019-12-01 18:24:52 +01:00
TheBusyBiscuit
135fe34221
Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee
Fixes #1272 & #1273
2019-12-01 16:58:02 +01:00
TheBusyBiscuit
51b347afe8 Changed a few category icons 2019-12-01 16:54:59 +01:00
TheBusyBiscuit
552c907f21 Fixed some christmas items 2019-12-01 16:54:50 +01:00
J3fftw1
90bcc2196c Fixes #1272 & #1273 2019-12-01 16:28:57 +01:00
TheBusyBiscuit
dbab114d8f Possibly fixes #1266 2019-11-30 01:00:24 +01:00
TheBusyBiscuit
ae74412fac Enhanced randomizer algorithm for Gold Pans 2019-11-30 00:58:35 +01:00
TheBusyBiscuit
41327d637c Added new API class 2019-11-30 00:44:44 +01:00
TheBusyBiscuit
d5482f5496 [CI skip] Some additional API work 2019-11-28 20:23:39 +01:00
TheBusyBiscuit
6312d6c431
Merge pull request #1270 from pentabulge/master
Updated recipes for Automated Panning Machine
2019-11-28 19:36:53 +01:00
TheBusyBiscuit
3a809ad5ab
Merge pull request #1268 from SoSeDiK/researches
Changed loading order
2019-11-28 19:36:38 +01:00
TheBusyBiscuit
015159dfe8 Fixes #1264 2019-11-28 19:35:28 +01:00
TheBusyBiscuit
95e5da325b Restructured a bit of the API (for future versions) 2019-11-28 19:34:43 +01:00
penta
ebe9375a80
Added Iron Nuggets & Soul Sand drops to recipes 2019-11-28 17:34:12 +01:00
poma123
19b604f1de Added javadocs to #getBlock 2019-11-27 17:39:08 +01:00
poma123
88f5d412e5 Event calling added into "movedig" 2019-11-27 17:35:58 +01:00
SoSeDiK
b39a08d557
Changed loading order
Fixes researching not being enabled by default when starting the server for the first time
2019-11-27 18:29:45 +02:00
SoSeDiK
f63c290041
Minor changes to formatting
- Fixed color
- Removed empty lines
- Changed formatting according to the other pages in the guide
2019-11-27 18:23:11 +02:00
poma123
b069f9c354 Added AndroidMineEvent 2019-11-26 22:46:00 +01:00
J3fftw1
eea32be7dd removed empty lines 2019-11-26 19:30:52 +01:00
J3fftw1
23202d1cd6 few more fixes 2019-11-26 19:29:13 +01:00
J3fftw1
80094b4f1b
Merge branch 'master' into qol/sf-version 2019-11-26 19:26:44 +01:00
J3fftw1
334a1058b4 merged latest master 2019-11-26 19:16:39 +01:00
J3fftw1
b220f3a39e added cscorelib version to the guide 2019-11-26 19:00:35 +01:00
TheBusyBiscuit
61a58d87dd Added Iron Nuggets to Gold Pan drops 2019-11-26 00:48:47 +01:00
TheBusyBiscuit
c9bd5840e0 Added Nether Gold Pan 2019-11-26 00:39:54 +01:00
TheBusyBiscuit
85227f0814
Merge pull request #1258 from NiekWilting/fix-titles
Fixed the getTitle method.
2019-11-24 14:28:10 +01:00
Niek Wilting
1f9cbc0b13 Fixed the getTitle method. 2019-11-24 14:11:34 +01:00
TheBusyBiscuit
0a44fa5671 Revamped Guide Settings Menu 2019-11-24 13:23:16 +01:00
TheBusyBiscuit
7ad4d92a14 [CI skip] Added Slimefun Guide and Recipe Types to custom item model
service
2019-11-22 14:57:04 +01:00
TheBusyBiscuit
8a605404c1 Added "Flint to Cobblestone" Recipe to the Compressor 2019-11-21 20:36:50 +01:00
TheBusyBiscuit
28ed785cf7
Merge pull request #1247 from J3fftw1/research/jerk
added jerkys to research
2019-11-17 21:31:44 +01:00
J3fftw1
1ac713cb58
Update ResearchSetup.java 2019-11-17 21:31:10 +01:00
TheBusyBiscuit
b1950447d6
Added more wiki pages to the guide 2019-11-17 21:30:39 +01:00
J3fftw1
f33218c10e
Update ResearchSetup.java 2019-11-17 21:29:59 +01:00
J3fftw1
8cb7108c27 reeeeeeeee sowwe 2019-11-17 18:49:06 +01:00
J3fftw1
a6129e65e9 fixed the tabs and changed jerky to jerky's
crossing fingers for correct use of '
2019-11-17 18:45:50 +01:00
J3fftw1
4b044cba16 fixed suggested changes 2019-11-17 18:26:54 +01:00
J3fftw1
152dcac0c7 fixed the changes SoSeDiK suggested/requested 2019-11-17 11:19:37 +01:00
J3fftw1
29543f4a2a changes 2019-11-16 23:48:30 +01:00
Daniel Walsh
1569f7e05e
Fix #1229 2019-11-16 22:06:26 +00:00
J3fftw1
4a83ecca07 added jerkys to research 2019-11-16 20:08:46 +01:00
TheBusyBiscuit
0a08690ae9
Merge pull request #1244 from poma123/patch-1
AutoDisenchantEvent
2019-11-16 17:47:32 +01:00
Poma123
87caf6ee45
Update AutoDisenchantEvent.java 2019-11-16 17:03:56 +01:00
Poma123
da0fe57ab7
Update AutoDisenchantEvent.java 2019-11-16 16:58:27 +01:00
Poma123
918d9c3506
Update AutoDisenchanter.java 2019-11-16 16:36:45 +01:00
Poma123
212b7cffd3
Update AutoDisenchantEvent.java 2019-11-16 16:35:22 +01:00
Poma123
72a7f4598f
Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java 2019-11-16 16:34:14 +01:00
Poma123
201159f3bf
Update AutoDisenchanter.java 2019-11-16 16:29:59 +01:00
Poma123
537fc57f48
Update AutoDisenchanter.java 2019-11-16 16:27:15 +01:00
Poma123
d18adecb9a
Update DisenchanterEvent.java 2019-11-16 16:26:28 +01:00
Poma123
fa57e61447
Update AutoDisenchanter.java 2019-11-16 15:50:52 +01:00
Poma123
6f3bf2db13
Update DisenchanterEvent.java 2019-11-16 15:49:06 +01:00
Poma123
c6428c0e4b
Update AutoDisenchanter.java 2019-11-16 14:09:09 +01:00
Poma123
f0c0919bce
Add DisenchanterEvent 2019-11-16 14:08:38 +01:00
TheBusyBiscuit
fcf9b547c1
Merge pull request #1230 from SoSeDiK/transmitters
Transmitters
2019-11-16 14:08:22 +01:00
TheBusyBiscuit
09ab124e36 Added Output Chest support to the Table Saw 2019-11-10 20:18:06 +01:00
SoSeDiK
78c81bafdb
Merge branch 'master' into transmitters 2019-11-10 21:04:50 +02:00
TheBusyBiscuit
7890edd295 Added Output Chest Support to the Automated Panning Machine 2019-11-10 19:44:53 +01:00
TheBusyBiscuit
a10fe1e514 Fixed custom model data 2019-11-10 18:54:53 +01:00
TheBusyBiscuit
40616ee47e
Merge pull request #1239 from TheBusyBiscuit/custom-textures
Added support for custom item models
2019-11-10 18:52:36 +01:00
TheBusyBiscuit
97d8ce1546 Moved CoreProtect integration to CS-CoreLib2 2019-11-10 18:52:18 +01:00
TheBusyBiscuit
3e30ce8d14 Reduced technical debt 2019-11-10 18:43:37 +01:00
TheBusyBiscuit
2459469c9d Added support for custom item models 2019-11-10 17:46:18 +01:00
TheBusyBiscuit
2c7e155aa1 Added different kinds of Jerky to the Auto-Drier 2019-11-10 13:51:56 +01:00
TheBusyBiscuit
25f8566196
Merge pull request #1222 from AlexLander123/fixes
Changed method of accessing reactor from access port
2019-11-10 13:01:19 +01:00
TheBusyBiscuit
fc67fac34c [CI skip] Changed default version string 2019-11-10 13:01:07 +01:00
AlexLander123
c13ec9903c Ancient altar no longer able to craft items that are not unlocked 2019-11-06 02:17:52 +08:00
AlexLander123
9442fa65ca Fixed ancient alter logic 2019-11-06 00:56:03 +08:00
AlexLander123
e4efed0640 Made requested changes
- Added null check
- Changed "a access port" to "the access port"
- Removed extra menu.open(p)
2019-11-06 00:08:25 +08:00
SoSeDiK
2fb92c5083 Update GPSNetwork.java 2019-11-04 16:36:10 +02:00
SoSeDiK
0302810c9c Replaced double with int 2019-11-04 16:33:40 +02:00
SoSeDiK
09c02b7848 Fixed transmitter locations 2019-11-04 16:28:12 +02:00
TheBusyBiscuit
8895beb83a [CI skip] Minor refactoring 2019-11-03 23:43:11 +01:00
TheBusyBiscuit
57da6db9be Reduced technical debt and improved talisman performance 2019-11-03 21:32:44 +01:00
TheBusyBiscuit
a1e47d5ce0 Many bug fixes, many guide improvements 2019-11-03 20:36:46 +01:00
TheBusyBiscuit
27019c9ceb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 20:28:35 +01:00
TheBusyBiscuit
6a1b6ffd92 Added support for ALL Vanilla Recipes (+ Faster Guide Responses) 2019-11-03 20:28:25 +01:00
Daniel Walsh
2febbe4d1c order 2019-11-03 19:05:32 +00:00
Daniel Walsh
d88291e215 Bring across repair cost in the disenchanter 2019-11-03 19:03:55 +00:00
TheBusyBiscuit
d86cb5e5b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 19:23:39 +01:00
TheBusyBiscuit
fc6bd05b4f
[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes
Fixes
2019-11-03 19:23:19 +01:00
TheBusyBiscuit
beebbda2dd Fixes #1224 2019-11-03 19:20:22 +01:00
TheBusyBiscuit
5c860cbfa4 Fixes #1226 2019-11-03 19:20:12 +01:00
J3fftw1
cade8df053 Fixes #1219 2019-10-31 16:24:27 +01:00
AlexLander123
6dd56e23f2 Changed method of accessing reactor from access port
The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false
2019-10-31 22:01:53 +08:00
TheBusyBiscuit
05858309c5 [CI skip] Reduced technical debt 2019-10-29 09:13:32 +01:00
TheBusyBiscuit
7ba0eba4e9 Fixes #1211 2019-10-28 14:53:54 +01:00
AlexLander123
8601986c09 Allow reactors to take in fuel from access port
- Also allow reactors to take in fuel in bulk
2019-10-28 04:02:06 +08:00
TheBusyBiscuit
9f3c3a413b Some optimizations, also changed /sf timings to use floating point times 2019-10-27 20:07:12 +01:00
TheBusyBiscuit
e036e0f756 Fixes #1206 2019-10-27 14:18:31 +01:00
TheBusyBiscuit
bf4991264b Migrated more Items to the new System (+ Added auto-migration) 2019-10-27 14:38:39 +01:00
TheBusyBiscuit
57e1126553 Optimized and cleaned up guide 2019-10-20 16:41:28 +02:00
TheBusyBiscuit
1c12b892fe
Merge pull request #1203 from J3fftw1/veinminerfix
fixes #1202
2019-10-20 14:25:25 +02:00
J3fftw1
852b4bfc2a fixes #1202 2019-10-20 14:19:27 +02:00
TheBusyBiscuit
ad3ca513ad Fixed Multi Tools 2019-10-19 19:06:38 +02:00
TheBusyBiscuit
783a66d2da Fixed Food 2019-10-19 18:20:08 +02:00
TheBusyBiscuit
bb2d9d851f Fixes #1153 2019-10-19 18:18:17 +02:00
TheBusyBiscuit
41811b90f1 [CI skip] Added some documentation to the code 2019-10-19 16:48:22 +02:00
TheBusyBiscuit
a3bf63a023 More optimizations (+ Added more Jerky Meat) 2019-10-19 16:16:40 +02:00
TheBusyBiscuit
3eed8cebc6 Another fix 2019-10-19 15:15:11 +02:00
TheBusyBiscuit
70cc1d04f4 Fixes #1196 2019-10-19 15:14:05 +02:00
TheBusyBiscuit
c5341a6b02 Fixes #1196 2019-10-19 15:04:45 +02:00
TheBusyBiscuit
fc7c4e4d81 Fixed #1200 2019-10-19 12:53:13 +02:00
TheBusyBiscuit
260c3a51dd More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer) 2019-10-19 10:30:15 +02:00
AlexLander123
1dc669740c Allow /sf cheat to have all categories unlocked
- If the player who who is using /sf cheat have not unlocked the category, they will still have access to it
- Removed empty code
2019-10-18 21:27:28 +08:00
J3fftw1
576b297b50 Fixed ExplosivePickaxe 2019-10-18 00:15:48 +02:00
J3fftw1
470f5f1afe fixed requested changes 2019-10-17 23:23:25 +02:00
J3fftw1
10fe7238ad fixed broken items 2019-10-17 23:14:43 +02:00
TheBusyBiscuit
06e3125a6d Repositioned back button for guide search 2019-10-17 01:33:49 +02:00
TheBusyBiscuit
f71b925a41 Improved Guide Search 2019-10-17 01:27:00 +02:00
TheBusyBiscuit
ee6dfae045 Fixed Guide Search's back button 2019-10-17 01:21:04 +02:00
TheBusyBiscuit
5fa021469f Added a logging message 2019-10-17 01:12:47 +02:00
TheBusyBiscuit
07827ecc53 Moved Guide History to Player Profiles 2019-10-17 01:08:14 +02:00
TheBusyBiscuit
45a688e148 Added wiki pages to the guide 2019-10-17 00:49:55 +02:00
TheBusyBiscuit
18b5bda4a8 [CI skip] Introduced proper Maven structure 2019-10-17 00:37:46 +02:00
TheBusyBiscuit
20e3f2b9ce Some more bug fixes and optimizations 2019-10-14 20:50:57 +02:00
TheBusyBiscuit
7e0eb29040 Minor optimization 2019-10-14 17:58:15 +02:00
TheBusyBiscuit
b2fd914cee Fixed Backpacks 2019-10-14 17:18:37 +02:00
TheBusyBiscuit
6865ab8c6c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-14 17:18:08 +02:00
TheBusyBiscuit
fef43314f9 Fixed Backpacks not working 2019-10-14 17:17:50 +02:00
TheBusyBiscuit
fb652fe41d Another fix 2019-10-14 09:54:23 +02:00
TheBusyBiscuit
2a475811de Fixes #1180 (+ Improvements on MultiTool performance) 2019-10-14 09:31:14 +02:00
creator3
9551bf5a5c
Fix major BlockStorage performance regression 2019-10-13 19:01:00 -04:00
TheBusyBiscuit
090f45d93f
Merge pull request #1176 from WalshyDev/qol/improved-timings
Order timings
2019-10-13 19:05:16 +02:00
TheBusyBiscuit
005fbbdd13 Minor changes and optimizations 2019-10-13 19:05:04 +02:00
Daniel Walsh
d2e1dabf47 okie 2019-10-13 17:45:54 +01:00
TheBusyBiscuit
3239616f50 Hotfix 2 2019-10-13 18:44:59 +02:00
Daniel Walsh
8b4d927753 Fix NPE 2019-10-13 17:33:58 +01:00
Daniel Walsh
22a9f8955a Improve and also order console output 2019-10-13 17:32:42 +01:00
TheBusyBiscuit
a1e55d0d92 Hotfix 2019-10-13 18:26:18 +02:00
TheBusyBiscuit
2fc05354a0 Some more optimizations 2019-10-13 18:14:25 +02:00
Daniel Walsh
5c5214beba Fix 2 2019-10-13 17:06:45 +01:00
TheBusyBiscuit
e0d1a71453 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-13 16:37:28 +02:00
TheBusyBiscuit
819a59d3a4 [CI skip] Micro-optimizations 2019-10-13 16:37:13 +02:00
Daniel Walsh
c17d4f5afc fix dat 2019-10-13 15:25:57 +01:00
TheBusyBiscuit
a2fe40cfe1
Merge pull request #1174 from WalshyDev/async-player-profile-fetch
Implement PlayerProfile async fetch
2019-10-13 15:57:02 +02:00
TheBusyBiscuit
b76a7a3e24
[CI skip] Merge pull request #1175 from AlexLander123/fixes
Fixed NullPointerException when using Pickaxe of the Seeker
2019-10-13 15:56:24 +02:00
AlexLander123
b95b3d2bf4 Logic Correction for PickaxeOfTheSeeker 2019-10-13 21:01:15 +08:00
Daniel Walsh
7c46affc9a Order timings 2019-10-13 13:42:07 +01:00
AlexLander123
d2581c625d Performance improvement
Changed distance() to distanceSquared()
2019-10-13 19:36:02 +08:00
TheBusyBiscuit
d3b3fd15bd Very small performance optimizations 2019-10-13 13:24:14 +02:00
Daniel Walsh
c128ba872d *yawn* 2019-10-13 12:15:45 +01:00
AlexLander123
75d568c2dd Fixed NullPointerException
Fixed NullPointerException when using Pickaxe of the Seeker
2019-10-13 16:39:01 +08:00
Daniel Walsh
694d36afa6 General improvements and fixes 2019-10-11 23:56:51 +01:00
Daniel Walsh
6b62a45ffa Added opening messages to locale 2019-10-11 23:11:02 +01:00
TheBusyBiscuit
f62bdf92c0 [CI skip] Little optimization 2019-10-12 00:05:44 +02:00
TheBusyBiscuit
1c7639717e Added /sf search 2019-10-11 23:54:20 +02:00
Daniel Walsh
8cb37a1850 Implement PlayerProfile async fetch 2019-10-11 22:48:46 +01:00
AlexLander123
5d107de6ac Readded hasItemMeta() check 2019-10-10 00:14:02 +08:00
AlexLander123
8b8486a2e7 Clarification of code 2019-10-09 22:47:33 +08:00
AlexLander123
691256cefe Added hasDisplayName check 2019-10-09 22:06:31 +08:00
AlexLander123
8cc822429d Allow BlockPlacer to place blocks while retaining certain data
BlockPlacer will set block's name and inventory according to its itemstack.
2019-10-09 21:49:02 +08:00
TheBusyBiscuit
1d509cf52d Added a Recipe for the Totem of Undying (+ Altered Elytra Scale Recipe) 2019-10-07 20:24:07 +02:00
TheBusyBiscuit
0b4f07ac44 Fixes #1171 2019-10-07 19:24:52 +02:00
TheBusyBiscuit
fb636b0d2a
[CI skip] Merge pull request #1169 from J3fftw1/J3fftw1-patch-6
Update SlimefunItems.java
2019-10-07 18:01:00 +02:00
J3fftw1
ca6dac8862
Update SlimefunItems.java 2019-10-07 17:55:21 +02:00
TheBusyBiscuit
e7ed2b6b72 Moved more Items to the new system 2019-10-07 16:09:45 +02:00
TheBusyBiscuit
04d114cd44
Merge pull request #1167 from J3fftw1/master
Added lightning rune to research and gave it its own research
2019-10-07 15:39:35 +02:00
J3fftw1
18846ba0f0
Update ResearchSetup.java 2019-10-07 13:35:27 +02:00
J3fftw1
bea1b4ead6
Update ResearchSetup.java 2019-10-07 08:15:58 +02:00
J3fftw1
3beaf5c99d
Update ResearchSetup.java 2019-10-07 07:59:16 +02:00
TheBusyBiscuit
2044a4e489 Removed debug message 2019-10-06 19:33:34 +02:00
TheBusyBiscuit
0aa989c9fb More performance improvements 2019-10-06 19:32:55 +02:00
TheBusyBiscuit
58889c46d0 Fixes #1162 (also more performance improvements) 2019-10-06 17:04:34 +02:00
TheBusyBiscuit
64bd72a695 Some minor refactoring, also added 2 new recipes to the Crucible 2019-10-06 14:32:06 +02:00
TheBusyBiscuit
3540faa65c More performance improvements 2019-10-06 13:31:57 +02:00
TheBusyBiscuit
dc12ac6e6f Migrated more items to the new system 2019-10-06 00:11:42 +02:00
TheBusyBiscuit
065c9e8f21 Reduced technical debt + Improved Guide Performance 2019-10-05 23:49:25 +02:00
TheBusyBiscuit
da7eff0d87 Added support for all wooden fences in Multiblock structures 2019-10-05 23:49:11 +02:00
TheBusyBiscuit
7800058ed1 Fixes #1157 (Also updated to CS-CoreLib2 v0.6.1) 2019-10-05 22:16:55 +02:00
TheBusyBiscuit
c0142a6f30 Walshy is a god 2019-10-05 22:02:11 +02:00
TheBusyBiscuit
12efdbd510 Minor sanity changes 2019-10-05 21:51:18 +02:00
TheBusyBiscuit
6797620c2a Hopefully fixed a minor flaw 2019-10-05 21:35:48 +02:00
TheBusyBiscuit
76095333fe A very small performance improvement on radiation. 2019-10-05 21:30:48 +02:00
TheBusyBiscuit
2e77d306e2 Armor Task is now asynchronous 2019-10-05 21:16:21 +02:00
TheBusyBiscuit
9ac4e7eeea Fixed a little mistake 2019-10-05 21:04:42 +02:00
TheBusyBiscuit
6314d7e422 Minor change 2019-10-05 20:49:03 +02:00
TheBusyBiscuit
b07d87fecd Improved Armor Checks 2019-10-05 20:44:11 +02:00
TheBusyBiscuit
b36f9cd3b5 Huge stability and performance improvements (Ticks are skipped upon lag) 2019-10-04 14:19:57 +02:00
TheBusyBiscuit
e772b55e83 Huge stability and performance improvements (Ticks are skipped upon lag) 2019-10-04 14:13:45 +02:00
TheBusyBiscuit
5d1c36734e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-04 14:05:22 +02:00
TheBusyBiscuit
7bbf47639c Ticks may now be skipped if the server is falling behind. 2019-10-04 14:05:16 +02:00
TheBusyBiscuit
561445768d
Merge pull request #1152 from WalshyDev/performance-improvements
Some performance improvements
2019-10-04 14:01:24 +02:00
TheBusyBiscuit
2c9445a971
Merge pull request #1149 from J3fftw1/master
Changed values of sound decaying
2019-10-04 14:01:18 +02:00
Daniel Walsh
5b188bcfaa Merge unmerged items and don't always merge first item 2019-10-04 12:49:23 +01:00
Daniel Walsh
23c39dc81e Thanks :coookie: 2019-10-04 12:40:24 +01:00
Daniel Walsh
a0b4a32fe0 fix typo 2019-10-04 12:39:42 +01:00
Daniel Walsh
fe3cdc6e8d Few more things 2019-10-04 12:38:48 +01:00
Daniel Walsh
8e766f644a CargoNet cleanup 2019-10-04 12:34:15 +01:00
Daniel Walsh
bcb79afc9c TimerTask cleanup 2019-10-04 12:27:24 +01:00
J3fftw1
27521167a8
Update InfusedHopper.java 2019-10-04 13:02:06 +02:00
Daniel Walsh
5ac4920756 Some performance improvements 2019-10-04 11:14:27 +01:00
TheBusyBiscuit
ebed466d69 Some Performance Improvements 2019-10-04 03:29:53 +02:00
TheBusyBiscuit
804bea553b Added Sweet Berry Juice 2019-10-04 03:11:40 +02:00
TheBusyBiscuit
5c40e689e9 Significant performance improvement for items crafted after this build 2019-10-04 02:54:46 +02:00
TheBusyBiscuit
d0329b185d Massive performance improvements for Items created after this build 2019-10-04 02:39:38 +02:00
TheBusyBiscuit
14cf3fee37 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
Conflicts:
	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
2019-10-04 02:21:38 +02:00
Daniel Walsh
581c2fc65d Changes 2019-10-04 01:14:09 +01:00
TheBusyBiscuit
4a339c6f80 Updated even more staff 2019-10-04 01:57:10 +02:00
Daniel Walsh
31f82b899f move id to SlimefunItemStack 2019-10-04 00:45:51 +01:00
Daniel Walsh
db0ed1a46b I want a cookie! 2019-10-04 00:31:47 +01:00
Daniel Walsh
3255269e2b Small fix 2019-10-04 00:29:46 +01:00
TheBusyBiscuit
4a2ca7599b Further updates 2019-10-04 01:25:19 +02:00
TheBusyBiscuit
49f1247b13 Removed unused Heavy Armor 2019-10-04 01:21:30 +02:00
Daniel Walsh
160f471445 Implement persistent data to getByItem and isItem 2019-10-04 00:20:36 +01:00
TheBusyBiscuit
4882a97ff5 Updated some outdated stuff 2019-10-04 01:02:51 +02:00
Daniel Walsh
9ba54a79cf Implement persistent ID 2019-10-03 23:37:13 +01:00
Daniel Walsh
2d8cb7c30b Some constructor cleanup 2019-10-03 22:58:48 +01:00
J3fftw1
9aab707291
Update MagnetTask.java 2019-10-03 23:08:41 +02:00
J3fftw1
01971edbc6
Merge pull request #1 from J3fftw1/J3fftw1-patch-1
Update TeleportationSequence.java
2019-10-03 23:01:04 +02:00
J3fftw1
69bcd30399
Merge pull request #2 from J3fftw1/J3fftw1-patch-2
Update ArmorListener.java
2019-10-03 23:00:50 +02:00
J3fftw1
b1a94fe5ec
Merge pull request #3 from J3fftw1/J3fftw1-patch-3
Update RitualAnimation.java
2019-10-03 23:00:43 +02:00
J3fftw1
445312e31f
Update MagnetTask.java 2019-10-03 22:57:41 +02:00
J3fftw1
7c8dfac1b4
Update RitualAnimation.java 2019-10-03 22:54:11 +02:00
J3fftw1
a30650d16d
Update ArmorListener.java 2019-10-03 22:51:36 +02:00
J3fftw1
55efcc454c
Update TeleportationSequence.java 2019-10-03 22:46:18 +02:00
TheBusyBiscuit
f818668ba0 You can no longer cheat in Multiblocks (+ Code cleanup) 2019-10-03 18:06:14 +02:00
TheBusyBiscuit
fdb0d011ef Reworked some internal stuff 2019-10-02 13:54:59 +02:00
TheBusyBiscuit
74ee019603 Smeltery now shows all its "1 component"-Recipes in the Guide 2019-10-01 18:48:13 +02:00
TheBusyBiscuit
695ed72f0c Changed Ignition Chamber Recipe 2019-10-01 18:47:48 +02:00
TheBusyBiscuit
db0b6dfa90 Fixed Stone Chunk -> Cobblestone Recipe not working 2019-10-01 18:47:40 +02:00
TheBusyBiscuit
431892abb2 Updated some deprecated methods 2019-10-01 17:04:09 +02:00
TheBusyBiscuit
21582610ad Updated to CS-CoreLib2 v0.5.6 2019-10-01 13:14:50 +02:00
TheBusyBiscuit
ff85e4d894
Merge pull request #1138 from WalshyDev/feature/guide-search
Guide Search!
2019-10-01 02:58:56 +02:00
TheBusyBiscuit
7cac093419 Updated CS-CoreLib2 and refactored commands 2019-10-01 02:57:58 +02:00
Daniel Walsh
00ef4d59e8 I hate life 2019-09-30 19:36:08 +01:00
Daniel Walsh
0743d05311 Localization 2019-09-30 19:33:44 +01:00
Daniel Walsh
b0b55f13ad Oops, unused import 2019-09-30 18:14:54 +01:00
Daniel Walsh
570319b5ae Switch to MenuHelper.awaitChatInput 2019-09-30 18:06:50 +01:00
TheBusyBiscuit
3d8d9ed624
Merge pull request #1139 from SoSeDiK/npe
Fix two NPEs when loading without CS-CoreLib
2019-09-30 18:40:57 +02:00
SoSeDiK
abf00e038b Use tabs everywhere 2019-09-30 19:33:35 +03:00
SoSeDiK
c56225d051 Fix NPE on disabling without CS-CoreLib 2019-09-30 19:21:33 +03:00
SoSeDiK
f45c40e103 Fix NPE on loading without CS-CoreLib 2019-09-30 19:20:08 +03:00
TheBusyBiscuit
4bb9abd247 Fixed stable-builds Updater 2019-09-30 00:04:43 +02:00
Daniel Walsh
631403ae4e
Add notice for stable
Some people disable auto-updates on dev builds because they can have issues. Let's instead advertise the stable branch
2019-09-29 22:57:15 +01:00
WalshyDev
52f078a025 Finish search 2019-09-28 16:13:23 +01:00
WalshyDev
fd4f92326d Cleanup 2019-09-27 20:40:51 +01:00
TheBusyBiscuit
0a540aa16a Removed the Saw Mill from Slimefun 2019-09-27 21:11:26 +02:00
TheBusyBiscuit
cff45aae66 Updated CS-CoreLib2 dependency 2019-09-27 21:08:57 +02:00