Freeze_Dolphin
51b72d4dba
Revert "Correction of wrongly spelled words."
...
This reverts commit 7e74c5a8b2
2021-05-04 07:32:38 +00:00
Freeze_Dolphin
7e74c5a8b2
Correction of wrongly spelled words.
2021-05-04 04:52:58 +00:00
TheBusyBiscuit
e51fcde16f
Update OutputChest.java
2021-05-03 15:28:11 +02:00
TheBusyBiscuit
0b55c9e8a0
Updated author tag
2021-05-03 15:24:19 +02:00
TheBusyBiscuit
7b615a66f2
Fixes #3013
2021-05-03 15:22:13 +02:00
TheBusyBiscuit
399359ae25
Reduced memory usage for networks and enforce world limitation
2021-05-03 15:19:33 +02:00
TheBusyBiscuit
c29d0e5530
Fixed #3012
2021-05-03 13:05:22 +02:00
svr333
e7557ca680
Merge branch 'master' into fix/hologram-dupes
2021-05-01 01:46:58 +02:00
TheBusyBiscuit
df7b262d14
Fixed #3007
2021-05-01 00:09:38 +02:00
TheBusyBiscuit
9f3f23fb75
Potentially fixed #2927
2021-04-30 16:18:24 +02:00
TheBusyBiscuit
a0695e0df4
Merge pull request #2994 from Mooy1/android-click-fix
...
Fix android click handler errors while moving
2021-04-30 12:51:34 +02:00
TheBusyBiscuit
5f1aeecdbf
[CI skip] Updated changelog
...
Also fixed MultiCategory not respecting guide main page index.
2021-04-30 12:51:22 +02:00
TheBusyBiscuit
e609e9e0ae
Merge pull request #2993 from Mooy1/guide-history-fix
...
Fixed #2593
2021-04-30 12:36:47 +02:00
TheBusyBiscuit
8c0fbfb295
More refactoring
2021-04-30 11:22:18 +02:00
TheBusyBiscuit
2382b940f1
Refactoring
2021-04-30 10:54:40 +02:00
TheBusyBiscuit
b92de66a27
[CI skip] Added missing import
2021-04-30 10:32:57 +02:00
TheBusyBiscuit
c215940cb9
Marked some items as unplaceable
2021-04-29 21:18:32 +02:00
TheBusyBiscuit
586e0516cf
[Ci skip] Some refactoring
2021-04-29 20:48:05 +02:00
TheBusyBiscuit
ced3cf9f50
Removed some deprecated methods
2021-04-29 20:37:54 +02:00
TheBusyBiscuit
90c8e2f278
Fixes #2999
2021-04-29 17:52:21 +02:00
a
a1619206ea
Update ProgrammableAndroid.java
2021-04-27 09:36:16 -05:00
a
bf5ada4eab
Update ProgrammableAndroid.java
2021-04-27 09:34:52 -05:00
a
f79840bf66
changes
2021-04-27 09:26:56 -05:00
Riley
31ddf8e7de
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-26 18:55:24 -05:00
a
a1a6253961
Update ProgrammableAndroid.java
2021-04-26 18:43:10 -05:00
a
61ff68d34a
fix
2021-04-26 18:15:07 -05:00
TheBusyBiscuit
757d7613ac
[CI skip] Formatting
2021-04-26 18:06:25 +02:00
Rothes
a59f5cb067
Update
2021-04-26 17:20:44 +08:00
Rothes
ff58e53145
Update
2021-04-26 15:17:39 +08:00
Rothes
205f8d02b1
Merge branch 'master' into master
2021-04-26 12:28:03 +08:00
TheBusyBiscuit
f048d0276b
Merge pull request #2982 from martinbrom/fix/auto-enchanter-fixed-order
...
Fixes #2977
2021-04-25 20:13:59 +02:00
TheBusyBiscuit
a7835197a5
Some minor code improvements
2021-04-25 20:13:51 +02:00
TheBusyBiscuit
d91d9c2856
Removed Automated Crafting Chamber
2021-04-25 19:49:17 +02:00
TheBusyBiscuit
bffef56407
Added Category#setTier()
2021-04-25 19:47:58 +02:00
TheBusyBiscuit
c975fe234e
Fixed #2989
2021-04-25 19:29:57 +02:00
Daniel Walsh
2f27ddc6a6
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil
...
Fixes NPE when hand is empty while talisman of the anvil triggers
2021-04-24 12:22:59 +01:00
Martin Brom
a6f3696719
Fixes NPE when hand is empty while talisman of the anvil triggers
...
Resolves #2987
2021-04-24 12:22:40 +02:00
TheBusyBiscuit
1c5372d261
Complete restructure of language files
2021-04-23 20:48:24 +02:00
TheBusyBiscuit
1982ec0aeb
Reorganized language files
2021-04-23 19:22:25 +02:00
TheBusyBiscuit
34421d4a12
More refactoring
2021-04-23 19:01:41 +02:00
TheBusyBiscuit
a3a9ee4b90
Various code improvements
2021-04-23 18:58:35 +02:00
TheBusyBiscuit
8aeda66c5e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
2021-04-23 18:30:12 +02:00
TheBusyBiscuit
f017088f42
[CI skip] Small docs changes
2021-04-23 18:29:55 +02:00
Martin Brom
a94926dfaf
Small Auto-Enchanter cleanup
2021-04-23 17:12:26 +02:00
Martin Brom
cfb9f53057
Auto-Enchanter now checks both combinations of book and item in its inventory
...
Fixes #2977
2021-04-23 17:03:02 +02:00
Rothes
31a571455c
Update AbstractEnchantmentMachine.java
2021-04-23 20:08:40 +08:00
Rothes
67c0947dc8
Added toggle setting and some edit.
2021-04-23 20:04:00 +08:00
Daniel Walsh
b0f2fc8c4d
Merge pull request #2967 from variananora/add-suggestion-311
2021-04-23 12:50:41 +01:00
TheBusyBiscuit
c2ec4693ac
Merge pull request #2963 from martinbrom/feature/coalblock-carbon
...
Add Block of Coal -> Carbon recipe to the Carbon Press and Compressor
2021-04-23 13:46:22 +02:00
BuildTools
a846d4ea1b
Re-added check null and empty.
2021-04-23 19:29:36 +08:00
Varian Anora
45d6c376af
Update researches_en.yml
2021-04-22 20:14:52 +07:00
Varian Anora
23d4aad256
Merge branch 'master' into add-suggestion-311
2021-04-22 20:12:47 +07:00
Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected
2021-04-22 11:03:03 +01:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-22 17:33:27 +08:00
Varian Anora
6840efe2f1
Changed Auto Disenchanter recipe and added new research for tier two enchanters.
...
Changed Auto Disenchanter Recipe to:
```
Auto Disenchanter II
Speed: 3x
Power: 48J/s
Buffer: 1024J
Recipe:
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Blistering Ingot (100%)
D = Auto Disenchanter
E = Wither Proof Obsidian
F = Big Capacitor```
Changed wither proof obsidian with big capacitor for the buffer size.
Added new research for tier two enchanters with 48 exp levels on ID 277.
2021-04-22 12:30:58 +07:00
Rothes
16a5a2ce06
Update
2021-04-22 11:58:52 +08:00
Varian Anora
9dec7b710d
Merge branch 'master' into add-suggestion-311
2021-04-22 10:39:45 +07:00
BuildTools
76f5848e08
Use ItemName in default value instead of Identifier
2021-04-21 22:34:17 +08:00
Rothes
ecb23fa5e5
Update
2021-04-21 18:02:14 +08:00
BuildTools
27bbca1502
Update
2021-04-21 13:06:16 +08:00
BuildTools
8eb196caaa
a
2021-04-21 12:58:30 +08:00
TheBusyBiscuit
c0058a3994
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
2021-04-20 17:35:51 +02:00
Varian Anora
2803fbe61e
Merge branch 'master' into add-suggestion-311
2021-04-20 19:00:37 +07:00
IAmSorry
a16e1f6efc
Fixed the wrong protected :)
2021-04-19 22:30:07 +02:00
TheBusyBiscuit
0fbb9b2d9b
[CI skip] 200+ contributors, we need a third page 👀
2021-04-19 20:15:56 +02:00
IAmSorry
04b901928c
Change visibility to protected 19
2021-04-19 17:30:12 +02:00
IAmSorry
357898fe8e
Change visibility to protected 18
2021-04-19 17:28:47 +02:00
IAmSorry
cc39df17ac
Change visibility to protected 17
2021-04-19 17:26:34 +02:00
IAmSorry
86e73631c7
Change visibility to protected 16
2021-04-19 17:25:09 +02:00
IAmSorry
ce86abca47
Change visibility to protected 15
2021-04-19 17:23:40 +02:00
IAmSorry
6d36b43ced
Change visibility to protected 14
2021-04-19 17:22:31 +02:00
IAmSorry
ecda25819b
Change visibility to protected 13
2021-04-19 17:21:07 +02:00
IAmSorry
b0a8ab55b9
Change visibility to protected 12
2021-04-19 17:20:13 +02:00
IAmSorry
a0b559330d
Change visibility to protected 11
2021-04-19 17:19:11 +02:00
IAmSorry
848725c42b
Change visibility to protected 10
2021-04-19 17:18:02 +02:00
IAmSorry
e7a92113d1
Change visibility to protected 9
2021-04-19 17:17:19 +02:00
IAmSorry
d1259888ce
Change visibility to protected 8
2021-04-19 17:15:36 +02:00
IAmSorry
54309e1f56
Change visibility to protected 7
2021-04-19 17:14:20 +02:00
IAmSorry
96715da55a
Change visibility to protected 6
2021-04-19 17:13:14 +02:00
IAmSorry
6de81be703
Change visibility to protected 5
2021-04-19 17:11:20 +02:00
IAmSorry
7efd07da10
Change visibility to protected 4
2021-04-19 17:08:56 +02:00
IAmSorry
c28ad40cf7
Change visibility to protected 3
2021-04-19 17:07:08 +02:00
IAmSorry
a222ec14dc
Changing the visibility to protected 2
2021-04-19 17:03:58 +02:00
IAmSorry
c574065470
Change visibility to protected
2021-04-19 17:02:19 +02:00
TheBusyBiscuit
dcc5648c8f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-19 10:36:43 +02:00
Varian Anora
afc47f095c
Fix energy consumption on Auto Disenchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:21 +07:00
Varian Anora
4a949de996
Fix energy consumption on Auto Enchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:07 +07:00
Varian Anora
37d7772f02
Add tier II machines to Auto Enchanter and Auto Disenchanter
...
Auto Enchanter II
Speed 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | F | E |
A = Reinforced Plate
B = Big Capasitor
C = Blistering Ingot (100%)
D = Auto Enchanter
E = Wither Proof Obsidian
F = Synthetic Diamond
Auto Disenchanter II
Speed: 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Carbonado
D = Auto Enchanter II
E = Wither Proof Obsidian
2021-04-18 20:04:43 +07:00
TheBusyBiscuit
e59a5926c4
Code cleanup
2021-04-18 10:35:39 +02:00
TheBusyBiscuit
b20353557f
Photovoltaic Cells can no longer be placed
2021-04-18 10:11:32 +02:00
Varian Anora
473c58d720
Update GrindStone.java
2021-04-18 12:12:30 +07:00
Martin Brom
1c820196ef
Add Block of Coal -> Carbon recipe to the CarbonPress and Compressor
2021-04-17 14:41:24 +02:00
TheBusyBiscuit
f91481db1c
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
CHANGELOG.md
2021-04-17 09:51:24 +02:00
Daniel Walsh
bf22f40f99
Oops forgot one validate
2021-04-17 08:39:56 +01:00
TheBusyBiscuit
d2e17af2a1
Removed SlimefunBlockHandler
2021-04-16 15:05:39 +02:00
TheBusyBiscuit
aa85388480
Renamed Solar Panel to Photovoltaic Cell
2021-04-16 14:55:49 +02:00
TheBusyBiscuit
cb3e9dfbeb
[CI skip] Refactoring
2021-04-16 14:50:06 +02:00
Daniel Walsh
448d6ca565
Fix nullability - not sure why this wasnt flagged...
2021-04-15 12:23:02 +01:00
Daniel Walsh
38a2246561
Fixes #2942
2021-04-14 12:15:55 +01:00
TheBusyBiscuit
53471f1177
[CI skip] Refactoring
2021-04-10 21:03:03 +02:00
TheBusyBiscuit
485dec746b
Merge pull request #2951 from Slimefun/api/auto-enchant-event
...
AutoEnchantEvent
2021-04-10 19:12:03 +02:00
Daniel Walsh
c8bf364e8f
no idea what you mean :eyes
2021-04-10 16:28:46 +01:00
TheBusyBiscuit
8be5673b7f
Merge pull request #2950 from md5sha256/feature/optimized-cargo
...
Optimizations to cargo
2021-04-10 17:20:21 +02:00
Daniel Walsh
20855c6977
AutoEnchantEvent
2021-04-10 15:36:47 +01:00
Andrew Wong
270b907582
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-10 16:30:47 +02:00
Daniel Walsh
2e682c185d
Merge pull request #2929 from RobotHanzo/fix/unbreaking-misbehaviour
2021-04-10 13:51:02 +01:00
Daniel Walsh
63e3f553ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
2021-04-10 13:40:28 +01:00
TheBusyBiscuit
b4b0636cd7
Added magma cream/block to slime ball/block recipes to Freezer
2021-04-09 19:06:19 +02:00
TheBusyBiscuit
2ef332a003
Lowered "Magma block -> Sulfate" recipe to only require 1 magma block
2021-04-09 18:54:16 +02:00
TheBusyBiscuit
dbda4d0b23
Added a deprecation warning to the SlimefunBlockHandler
...
Also converted the remaining machines to the new system
2021-04-09 18:30:27 +02:00
Andrew Wong
debbc5bd17
Code format fixes, use an ArrayDeqeue in CargoNet#distributeItems
2021-04-09 14:20:23 +02:00
Andrew Wong
6c0c95c138
Fix star import
2021-04-09 00:19:41 +02:00
Andrew Wong
bccb2f38d5
Optimizations to cargo
...
This commit introduces two optimizations to cargo handling:
- Utilization of regex to validate integers in CargoNet#getFrequency,
- Smart shallow-cloning in CargoNetworkTask: using an ArrayList when round-robin is disabled
2021-04-08 23:46:43 +02:00
TheBusyBiscuit
e1f0e0cd6c
Converted more machines to the new BlockBreakHandler
2021-04-08 13:34:18 +02:00
TheBusyBiscuit
e52b1a92c7
Fixes #2944
2021-04-07 16:34:39 +02:00
TheBusyBiscuit
96f657f6e7
Small performance improvements
2021-04-05 13:16:31 +02:00
TheBusyBiscuit
bbd41ff70c
[CI skip] Fixed 24k carat gold ingot
2021-04-03 19:42:14 +02:00
TheBusyBiscuit
1955d1235b
[CI skip] Refactoring
2021-04-03 19:40:54 +02:00
TheBusyBiscuit
89b8b76fce
[CI skip] Refactoring... I said
2021-04-03 15:20:45 +02:00
TheBusyBiscuit
cb05563014
[CI skip] Refactoring
...
+ Removed unused class
2021-04-03 15:20:08 +02:00
TheBusyBiscuit
18139bb5c4
Fixed Grappling Hook vanishing in creative mode
2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c
Fixes #2926
2021-04-03 14:01:48 +02:00
RobotHanzo
dcf411032e
Fixes
2021-04-03 19:25:22 +08:00
RobotHanzo
d428375132
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 19:21:52 +08:00
RobotHanzo
a268088d59
Even more advanced enum
2021-04-03 19:13:12 +08:00
RobotHanzo
c56713ed7d
Now using enum
2021-04-03 16:07:41 +08:00
RobotHanzo
11fded46db
Overridable durability RNG
2021-04-02 22:16:25 +08:00
RobotHanzo
f9201b648a
Unused imp.
2021-04-02 21:48:44 +08:00
RobotHanzo
53b38e51be
Fix mistakes
2021-04-02 21:11:42 +08:00
RobotHanzo
a000c92d93
Null checks
2021-04-02 20:50:28 +08:00
RobotHanzo
1bc51f4d80
Fixes #2837
2021-04-02 17:40:00 +08:00
TheBusyBiscuit
ee8d421189
Ancient Pedestals can now be found under "Magical Gadgets"
2021-03-31 19:13:21 +02:00
TheBusyBiscuit
ca3715a0dc
Added Crafting Motor (crafting ingredient for Auto-Crafters)
...
Also retextured the Cargo Motor
2021-03-31 19:02:34 +02:00
TheBusyBiscuit
816cc0613b
Added "Slimeballs -> Slime Block" recipe to Electric Press
2021-03-31 18:31:59 +02:00
TheBusyBiscuit
61f0fa5d0d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-03-31 18:30:04 +02:00
TheBusyBiscuit
32c60ad5ac
[CI skip] Refactoring
2021-03-31 18:29:43 +02:00
TheBusyBiscuit
0ee724e1e5
Merge pull request #2919 from GallowsDove/master
...
Fixed damageable items not respecting `unbreakable` tag
2021-03-31 17:20:50 +02:00
J3fftw
567b5397cf
Update src/main/resources/languages/messages_en.yml
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-03-31 15:36:19 +02:00
Jeffrey Kosse
5649f95174
Added a new message to multiblocks to see if inventory is empty
2021-03-31 14:37:24 +02:00
GallowsDove
ae7c22703e
requested changes
2021-03-29 20:39:55 +02:00
GallowsDove
062adb4cb7
Hopefully improved code
2021-03-28 22:49:45 +02:00
GallowsDove
7536f01145
Added unbreakable support for damageable items
2021-03-28 22:33:04 +02:00
TheBusyBiscuit
82366191b0
Merge pull request #2916 from Slimefun/fix/issue-2650
...
Fixed 2650
2021-03-28 15:03:58 +02:00
Daniel Walsh
526c2cc76c
Update src/main/resources/languages/researches_en.yml
2021-03-28 13:56:50 +01:00
Sfiguz7
7d92fe45b6
Gitlost I'm coming
2021-03-28 14:54:54 +02:00
Sfiguz7
25fd2120dc
FUCK YOU
2021-03-28 14:53:15 +02:00
Sfiguz7
07c0e88bec
Fuck the research_en file
2021-03-28 14:50:14 +02:00
TheBusyBiscuit
fb8c2ede7f
Merge branch 'master' into fix/issue-2650
2021-03-28 14:47:47 +02:00
Sfiguz7
78d1a8b21a
More merge conflicts
2021-03-28 14:45:03 +02:00
Sfiguz7
7ee4b98745
Resolved merge conflicts
2021-03-28 14:43:57 +02:00
