TheBusyBiscuit
|
f3e1502203
|
Added a disclaimer
|
2020-10-08 11:39:51 +02:00 |
|
TheBusyBiscuit
|
033bd3b469
|
Update CONTRIBUTING.md
|
2020-10-08 11:18:22 +02:00 |
|
TheBusyBiscuit
|
fb8ff55504
|
Added missing bracket
|
2020-10-08 10:43:14 +02:00 |
|
TheBusyBiscuit
|
f2db686aba
|
Added info about guard blocks
|
2020-10-08 00:47:19 +02:00 |
|
NCBPFluffyBear
|
90ccbb2261
|
Organized imports
|
2020-10-07 17:37:41 -05:00 |
|
svr333
|
b722dc2a00
|
Update lore
|
2020-10-08 00:20:35 +02:00 |
|
TheBusyBiscuit
|
5a37c36826
|
Merge pull request #1909 from beSn0w/beeArmor
Addition: Bee Armor
|
2020-10-07 22:14:54 +02:00 |
|
TheBusyBiscuit
|
08ed8b21c8
|
Merge branch 'bee-armor' into beeArmor
|
2020-10-07 22:14:39 +02:00 |
|
NCBPFluffyBear
|
b577c1e4a3
|
Did changes
|
2020-10-07 13:45:49 -05:00 |
|
TheBusyBiscuit
|
4936c25e49
|
Horizontal whitespaces
|
2020-10-07 18:53:13 +02:00 |
|
TheBusyBiscuit
|
126ccf3d01
|
Formatting
|
2020-10-07 18:43:55 +02:00 |
|
TheBusyBiscuit
|
7c3fc99b3a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
|
2020-10-07 18:38:26 +02:00 |
|
TheBusyBiscuit
|
95084eff70
|
Added empty lines
|
2020-10-07 18:32:36 +02:00 |
|
TheBusyBiscuit
|
fc26f959b6
|
[CI skip] Small formatting correction
|
2020-10-07 18:30:21 +02:00 |
|
TheBusyBiscuit
|
ddf9016b05
|
StringBuilder
|
2020-10-07 18:28:04 +02:00 |
|
TheBusyBiscuit
|
e4ddc7c452
|
[CI skip] Enforce OTBS.
|
2020-10-07 18:27:01 +02:00 |
|
TheBusyBiscuit
|
fa2c1d9957
|
Updated code style guidelines
|
2020-10-07 18:25:33 +02:00 |
|
poma123
|
cd00848795
|
Merge branch 'master' into tags
|
2020-10-07 17:55:26 +02:00 |
|
TheBusyBiscuit
|
ed8f0e243b
|
Fixes #2405
|
2020-10-07 17:48:53 +02:00 |
|
TheBusyBiscuit
|
c3302d8cbd
|
Merge branch 'master' into tags
|
2020-10-07 17:44:27 +02:00 |
|
TheBusyBiscuit
|
9436f2ec47
|
Update CONTRIBUTING.md
|
2020-10-07 17:32:14 +02:00 |
|
TheBusyBiscuit
|
816c0a4e49
|
Updated headings
|
2020-10-07 17:23:44 +02:00 |
|
TheBusyBiscuit
|
bbb2a78a4c
|
Added some code-style guidelines to CONTRIBUTING
|
2020-10-07 17:16:33 +02:00 |
|
LinoxGH
|
eb572a1a77
|
Merge branch 'master' into EnergyConnector
|
2020-10-07 18:10:50 +03:00 |
|
svr333
|
d17d21b7ed
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-07 17:04:31 +02:00 |
|
svr333
|
a6a29509c7
|
Fix remaining issues
|
2020-10-07 17:02:42 +02:00 |
|
TheBusyBiscuit
|
273d95ed9c
|
Delete settings.json
|
2020-10-07 16:51:52 +02:00 |
|
svr333
|
5e39920e59
|
Remove static's
|
2020-10-07 16:45:34 +02:00 |
|
svr333
|
9be590459a
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-07 16:43:20 +02:00 |
|
svr333
|
79d652bb70
|
Add .factorypath and .vscode folder
|
2020-10-07 16:42:53 +02:00 |
|
TheBusyBiscuit
|
78515a3c61
|
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw
Add sticks recipe to table saw
|
2020-10-07 16:31:58 +02:00 |
|
TheBusyBiscuit
|
354cb201c5
|
[CI skip] Updated changelog
|
2020-10-07 16:31:33 +02:00 |
|
TheBusyBiscuit
|
20a9c642fe
|
Some code cleanup
|
2020-10-07 16:24:14 +02:00 |
|
poma123
|
7814bdcdee
|
Merge branch 'master' into tags
|
2020-10-07 16:11:41 +02:00 |
|
Senne Van Rompaey
|
085ad2cd6b
|
Merge branch 'master' into MoreTalismans
|
2020-10-07 16:06:32 +02:00 |
|
svr333
|
a5998773e3
|
Fix build error
|
2020-10-07 16:04:02 +02:00 |
|
TheBusyBiscuit
|
80c4242dd7
|
Merge pull request #2384 from Seggan/master
Added Elytra Cap
|
2020-10-07 16:01:45 +02:00 |
|
TheBusyBiscuit
|
7b179239e4
|
[CI skip] Updated changelog
|
2020-10-07 16:01:19 +02:00 |
|
svr333
|
3747ba4afa
|
Remove second consumeItem
|
2020-10-07 15:59:33 +02:00 |
|
svr333
|
a9b8f608ff
|
Attempt to make it work
|
2020-10-07 15:54:32 +02:00 |
|
TheBusyBiscuit
|
942cb8e1e1
|
Merge pull request #2404 from Sfiguz7/master
Fixes #2403
|
2020-10-07 14:30:10 +02:00 |
|
TheBusyBiscuit
|
c33f73d2fe
|
[CI skip] Updated changelog
|
2020-10-07 14:30:01 +02:00 |
|
Sfiguz7
|
91a7d9eacd
|
Why u do dis IntelliJ >:(
|
2020-10-07 13:37:32 +02:00 |
|
Sfiguz7
|
46dca73e04
|
Forgot to clean crucible changes off
|
2020-10-07 13:36:11 +02:00 |
|
Sfiguz7
|
f8be447821
|
Fixes #2403
|
2020-10-07 13:32:10 +02:00 |
|
Sfiguz7
|
51d0ac0417
|
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
|
2020-10-07 13:06:45 +02:00 |
|
svr333
|
85091516db
|
Add generic fail message
|
2020-10-07 12:12:02 +02:00 |
|
svr333
|
8ff3b31bf6
|
Create tryFind method
|
2020-10-07 12:03:45 +02:00 |
|
NCBPFluffyBear
|
37f0715156
|
Added permission checks for the GEO Scanner and GPS Control Panel
|
2020-10-06 19:46:22 -05:00 |
|
svr333
|
db7e39ff10
|
Fix requested changes
|
2020-10-07 00:06:32 +02:00 |
|