Commit Graph

315 Commits

Author SHA1 Message Date
budgidiere
e91f44d0a8
Merge pull request #59 from tr7zw/dev/upstream
Dev/upstream
2020-08-07 09:47:51 -05:00
Bud Gidiere
aeab0d5f19 remove unessary patch 2020-08-07 09:36:54 -05:00
Bud Gidiere
b09c8c6018 upstream patches 2020-08-07 09:22:32 -05:00
Bud Gidiere
f88f0d1774 update upstream submodules 2020-08-07 08:23:11 -05:00
budgidiere
81ec5adcb5
Merge pull request #58 from tr7zw/dev/feat/betterasyncpathfinding
Asnyc Nav fix
2020-08-06 20:12:29 -05:00
Bud Gidiere
bd89338c8e Asnyc Nav fix 2020-08-06 19:59:57 -05:00
budgidiere
064cade2a9
Merge pull request #56 from tr7zw/fix/housekeeping
Fix/housekeeping
2020-08-06 16:24:33 -05:00
budgidiere
3c887d3dff
Update README.md 2020-08-06 16:15:19 -05:00
budgidiere
86b82718a2
Update README.md 2020-08-06 16:15:00 -05:00
budgidiere
c13e12a7b2
Update README.md 2020-08-06 16:14:34 -05:00
budgidiere
771b936b13
Update LICENSE.md 2020-08-06 16:06:15 -05:00
budgidiere
5e15a57c37
Update README.md 2020-08-06 16:05:14 -05:00
Bud Gidiere
0f357b6d4b House keeping 2020-08-06 16:02:30 -05:00
budgidiere
0dfc64bcbe
Dev/feat/more lithium (#53)
* Create 0028-lithium-MixinChunkGeneratorAbstract.patch

* Create 0029-lithium-MixinDataWatcher.patch

* Create 0030-Fix-lead-fall-dmg-config.patch

* rebuild

* fix author

* Update 0026-lithium-MixinChunkGeneratorAbstract.patch

* Update PATCHES.md

Co-authored-by: tr7zw <tr7zw@live.de>
2020-08-06 20:54:26 +02:00
tr7zw
ed8c8ba036
Patch credits, readme updates (#54) 2020-08-06 19:18:29 +02:00
budgidiere
a458a886b7
Merge pull request #51 from tr7zw/fix/general
Fix/general
2020-08-06 09:44:32 -05:00
Bud Gidiere
ac23b5938f fix 2020-08-06 09:33:56 -05:00
Bud Gidiere
318fe9d893 Don't Double Upstream 2020-08-06 09:09:01 -05:00
Bud Gidiere
d4cec7deba Small Bug Fix/General Clean Up 2020-08-06 09:05:19 -05:00
budgidiere
be6d0614c7
Merge pull request #47 from tr7zw/fix/submodules
Stuff with sub-modules
2020-08-05 22:16:00 -05:00
budgidiere
5375aba660 Update readme 2020-08-05 22:07:50 -05:00
budgidiere
320186f1fc
Merge pull request #50 from RealGatt/fix/submodules
Fix Shulker Boxes
2020-08-05 22:03:31 -05:00
Gatt
da1f64ed35 remove custom workflow before PR 2020-08-06 12:56:22 +10:00
Gatt
c8ba772f4d Restore ShulkerBox Changes from 0001 2020-08-06 12:43:34 +10:00
Gatt
2727ac2ef9 Restore Patch 24 (JSON List Async) as Patch 25 2020-08-06 12:29:18 +10:00
Gatt
9ef0e9e317 tr 2020-08-06 12:07:58 +10:00
Gatt
9229b0e649 Merge remote-tracking branch 'origin/ver/1.16.1' into fix/submodules 2020-08-06 12:07:49 +10:00
Gatt
fc4e2c7a18
Create main-fix.yml 2020-08-06 12:06:25 +10:00
Gatt
a963a29789
Create main.yml 2020-08-06 12:05:23 +10:00
Gatt
d73cef781e delete akarin patches 2020-08-06 12:04:43 +10:00
Bud Gidiere
b07adf23b1 new fix 2020-08-05 15:19:42 -05:00
Bud Gidiere
563fbe2b5b ok this should fix it 2020-08-05 15:07:55 -05:00
Bud Gidiere
01c3f7d84a Fix Build 2020-08-05 14:59:22 -05:00
Bud Gidiere
99029671ab Fix Build + Fix Shulkers 2020-08-05 14:38:36 -05:00
Bud Gidiere
c604b67764 fix 2? 2020-08-05 10:54:11 -05:00
Bud Gidiere
0e7bce1094
fix? 2020-08-05 08:55:13 -05:00
Bud Gidiere
8a615979b3
fix 2020-08-05 08:36:44 -05:00
Bud Gidiere
f733a06f98
Fix patches/config stuff 2020-08-05 08:21:25 -05:00
Bud Gidiere
16690df3b6
update patches 2020-08-04 19:27:24 -05:00
Bud Gidiere
4235442138
remove old asnyc pathfinding 2020-08-04 17:22:01 -05:00
Bud Gidiere
ace99fdac2
update upsteam 2020-08-04 17:21:08 -05:00
Bud Gidiere
50c42e9b81
patch stuff 2020-08-04 17:19:15 -05:00
Bud Gidiere
edb2ca49bc
add rain forest 2020-08-04 17:14:16 -05:00
Bud Gidiere
85252e3d9e
Removed submodule Papercut 2020-08-04 17:13:15 -05:00
Bud Gidiere
3e5cc3a957
re-add better origami 2020-08-04 17:11:48 -05:00
Bud Gidiere
2dc33b1652
Removed submodule Origami2 2020-08-04 17:09:56 -05:00
Bud Gidiere
bb5946ac13
remove origami(s) 2020-08-04 17:08:51 -05:00
tr7zw
cde82d5742
Merge pull request #42 from tr7zw/remove-bungee-patch
Remove bungeepatch
2020-08-04 09:57:53 +02:00
tr7zw
582e8550d4
Remove bungeepatch 2020-08-04 09:46:39 +02:00
tr7zw
8dba448aca
Merge pull request #40 from tr7zw/dev/bug/noportal
Update server.txt
2020-08-04 09:36:08 +02:00