Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] version/main from ldtteam:version/main #163

Open
wants to merge 1,413 commits into
base: version/main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
1413 commits
Select commit Hold shift + click to select a range
d7533fd
Improve builder logic (#9735)
someaddons Jan 28, 2024
df42a47
small guard armor changes (#9748)
Raycoms Jan 28, 2024
f180c76
move api module to api folder (#9749)
Raycoms Jan 28, 2024
35cf358
Refactor #2 (#9750)
Raycoms Jan 28, 2024
c1f99c5
Kill old proxies (#9752)
Raycoms Jan 28, 2024
983a581
Shire fixes, additions and revisions (#9753)
MotionlessTrain Jan 28, 2024
2cfacd5
fix 9740 (#9756)
Raycoms Jan 29, 2024
8461d4b
Shire, Cavern and Minecolonies Original fixes in 1.20 (#9754)
MotionlessTrain Feb 4, 2024
4bf0a7c
More quests (#9767)
Raycoms Feb 4, 2024
b24d3b8
adjust nether colony spawn (#9765)
Raycoms Feb 4, 2024
9237933
Add block diversity stat to schematic analyzer (#9763)
someaddons Feb 4, 2024
8b52253
Fakeplayer safety measure (#9760)
someaddons Feb 4, 2024
f4901a5
Correct some blueprint packs' descriptions (#9759)
mc-kaishixiaxue Feb 4, 2024
b0e0d74
Patreon additions (#9757)
Raycoms Feb 4, 2024
c6f7d07
[ImgBot] Optimize images (#9751)
imgbot[bot] Feb 4, 2024
59b54a3
prevent crash when quest gets removed (#9768)
Raycoms Feb 4, 2024
aca4444
Remove legacy code (#9770)
Raycoms Feb 5, 2024
3173e31
fix 9774 (#9775)
Raycoms Feb 11, 2024
c5c133d
fix entity kill stat display and fix break event cancel (#9780)
Raycoms Feb 12, 2024
9134c62
Update jpegs to pngs (#9783)
Thodor12 Feb 15, 2024
d6f9b6b
Urban Savannah and Colonial fixes in 1.20.1 (#9777)
MotionlessTrain Feb 15, 2024
4580840
Fix double feeding confusion (#9784)
someaddons Feb 18, 2024
9b66d89
Supply camp and ship enhancement (#9779)
MotionlessTrain Feb 18, 2024
c8cd2f9
fix wayyyyy too large pngs
Raycoms Feb 19, 2024
b8cda28
add water clearing step, use spawn entity step, fix msg (#9790)
Raycoms Feb 20, 2024
066501d
Some fixes (#9796)
Raycoms Feb 25, 2024
806b13f
Add set rank command (#9789)
someaddons Feb 25, 2024
0f68afc
Fix rotation of decoration controllers (#9792)
uecasm Feb 25, 2024
fb8e5a5
Fix armor level checking (#9786)
Thodor12 Feb 25, 2024
f582cf4
Medieval Oak and Minecolonies Original fixes (#9797)
MotionlessTrain Feb 25, 2024
aef941f
pathfinding adjustments (#9798)
someaddons Feb 25, 2024
0b158c7
Fix 9804 (#9806)
Raycoms Feb 28, 2024
a5d3cd2
Fix backups not loading from all dimensions (#9807)
someaddons Feb 28, 2024
5159e7b
Fix the Stalactite Caves barracks having an end stone block at levels…
MotionlessTrain Feb 29, 2024
dd78fec
Fix visitor sitting position being off at large coordinates (#9813)
someaddons Mar 2, 2024
1e6df92
Bunch o fixes (#9815)
Raycoms Mar 3, 2024
79c1652
[ImgBot] Optimize images (#9799)
imgbot[bot] Mar 3, 2024
9e357ae
Improve raider entity spawn position (#9802)
someaddons Mar 3, 2024
f090644
fix 9822
Raycoms Mar 9, 2024
081e376
Fix second crash in townhall map GUI (#9823)
Thodor12 Mar 9, 2024
2ab911c
Minecolonies Original and Stalactite Caves fix (#9818)
MotionlessTrain Mar 9, 2024
aa61e2c
add new way to detect DO mining (#9825)
Raycoms Mar 10, 2024
c977e1d
Immersive colony start (#9826)
Raycoms Mar 10, 2024
650b48e
Fix stonemason not being able to craft decorated pots, remove dyeing …
Thodor12 Mar 10, 2024
984f182
hotfix 9828
Raycoms Mar 10, 2024
59ece85
Update issue templates (#9838)
Thodor12 Mar 14, 2024
54273f4
Pathfinding restructuring & Fixes (#9837)
someaddons Mar 14, 2024
7822e1b
bunch of fixes (#9832)
Raycoms Mar 14, 2024
34155ca
Update housing2.json (#9834)
Talyda Mar 14, 2024
8db2a17
fix path reaching value (#9840)
someaddons Mar 14, 2024
9d339a3
Hotfix lumberjack pathfinding
someaddons Mar 16, 2024
7a37fcc
Fix citizen references (#9844)
someaddons Mar 17, 2024
ca9a711
Several fixes (#9833)
Thodor12 Mar 17, 2024
d8fd97c
couple of fixes (#9845)
Raycoms Mar 17, 2024
811f2d4
Shire fix and Medieval adjustments (#9846)
MotionlessTrain Mar 18, 2024
870b2c2
Refactor stories system (#9841)
uecasm Mar 18, 2024
90b7106
fix to map sync (#9853)
Raycoms Mar 19, 2024
f243223
Fix infinite debugging (#9856)
uecasm Mar 20, 2024
b73e46d
Several fixes (#9857)
Raycoms Mar 20, 2024
0711e70
Merge branch 'name-fixes' into version/1.19.2 (#9862)
Raycoms Mar 23, 2024
ab52125
Fix tooltip appearing on settings where it shouldn't (#9848)
Thodor12 Mar 24, 2024
60970f5
pathfinding heuristics (#9863)
someaddons Mar 24, 2024
d2056a6
Fix missing null checks
someaddons Mar 24, 2024
e00689e
Fix npe
someaddons Mar 24, 2024
9d2f51e
Fix pathing exception with extra nodes
someaddons Mar 24, 2024
a8992c7
Fix npe
someaddons Mar 24, 2024
457965d
Fix citizens loaded from chunks replacing active citizen (#9869)
someaddons Mar 27, 2024
ae3aa63
Builder pathfinding (#9872)
someaddons Mar 27, 2024
6a5bd37
Change shepherd ITEM_USED statistics to ITEM_OBTAINED (#9874)
Thodor12 Mar 27, 2024
6c0cda1
Dynamic gate tooltip (#9873)
uecasm Mar 27, 2024
ec67330
Because (#9852)
uecasm Mar 27, 2024
a513e70
Move quests to colony/quests (#9850)
uecasm Mar 27, 2024
1968130
Several fixes (#9879)
Raycoms Mar 31, 2024
4779325
miner liquid handling fixes (#9880)
Raycoms Mar 31, 2024
6075d21
Multi fixes (#9882)
Raycoms Apr 2, 2024
12c926f
Fix random pathing getting stuck (#9886)
someaddons Apr 2, 2024
8006e82
Fortress addition, Desert Oasis change and fixes in Colonial, Fortres…
MotionlessTrain Apr 2, 2024
251f655
Citizenfixes (#9891)
someaddons Apr 4, 2024
403fad3
Add more compatible entity creation (#9893)
someaddons Apr 5, 2024
1324c00
Allow tree chopping inside buildings when in a box again (#9888)
uecasm Apr 5, 2024
d74fe96
hotfix
Raycoms Apr 6, 2024
bccc1ab
Merge branch 'version/main' of https://github.com/ldtteam/minecolonie…
Raycoms Apr 6, 2024
c0c30a7
Fix pathing over blocks over water (#9897)
someaddons Apr 6, 2024
4f6b05b
Jungle Treehouse, Fortress and Minecolonies Original fixes (#9896)
MotionlessTrain Apr 6, 2024
9791479
Fix crafters walking outside their hut area (#9900)
someaddons Apr 8, 2024
7f71920
Fix uuid conflicts (#9901)
someaddons Apr 8, 2024
ef121cb
Fix uuid conflicts (#9902)
someaddons Apr 8, 2024
9cb9e59
Small fixes (#9903)
Raycoms Apr 8, 2024
e20c6fa
Small wander adjustment (#9918)
someaddons Apr 14, 2024
ec199d7
Stepped walls, roads and rails (#9913)
MotionlessTrain Apr 14, 2024
0c6d56d
Avoid error messages/mod compat on duplicate entities (#9914)
someaddons Apr 14, 2024
5099aba
Fix random bias (#9919)
someaddons Apr 14, 2024
526bbf8
make quests more uncommon, move research (#9906)
Raycoms Apr 14, 2024
6432c50
Visitor changes (#9917)
Raycoms Apr 14, 2024
96753b8
Feature/underwater raiders (#9899)
Raycoms Apr 14, 2024
d4be05f
Polymorph-like support for teaching crafting (#9907)
uecasm Apr 14, 2024
0c98ec1
[ImgBot] Optimize images (#9920)
imgbot[bot] Apr 14, 2024
0312aa9
add null check
Raycoms Apr 15, 2024
07c72ec
Rebalance baker foods (#9895)
uecasm Apr 21, 2024
baced51
Builder etc fixes (#9928)
Raycoms Apr 21, 2024
37ff2d6
ship raid changes (#9927)
Raycoms Apr 21, 2024
438a86c
Improvements for free blocks management (#9911)
uecasm Apr 21, 2024
3695b9f
Support for overworld mushroom trees in forester (#9924)
uecasm Apr 21, 2024
4f91361
Pathfinding fixes (#9930)
someaddons Apr 22, 2024
f08e8cb
new visitor and visitor changes
Raycoms Apr 26, 2024
e6de624
Merge branch 'version/main' of https://github.com/ldtteam/minecolonie…
Raycoms Apr 26, 2024
4698dcc
Refactor packages (#9935)
someaddons Apr 27, 2024
d38ea47
Fix compile (#9941)
someaddons May 3, 2024
2671796
sound manager rework (#9949)
Raycoms May 12, 2024
e4afdd6
Fix 9947 (#9948)
Raycoms May 12, 2024
e34e7a7
Message fixes (#9945)
someaddons May 12, 2024
d8cb5db
Update EntityAIWorkFarmer.java (#9940)
Thodor12 May 12, 2024
efad520
Fix food recipes (#9937)
uecasm May 12, 2024
be67e4b
Reworked fisher pond search (#9938)
someaddons May 12, 2024
07c24c0
add builder mode tooltips (#9951)
Raycoms May 12, 2024
20f7613
Fix farmer not tilling (#9952)
Thodor12 May 12, 2024
cc490f1
Add safeguard to mods messing with follow range (#9955)
someaddons May 15, 2024
ea66498
add null check (#9956)
Raycoms May 15, 2024
1bafff8
Miner ylevels (#9936)
someaddons May 15, 2024
8408316
Small performance improvements (#9953)
someaddons May 15, 2024
add1a46
Prevent crash on damaging unregistered citizen (#9957)
someaddons May 15, 2024
afe9722
Ancient greece (#9958)
Raycoms May 19, 2024
79d4f7b
Fix: quarrier's interaction with the zigzag iterator (#9959)
MotionlessTrain May 21, 2024
94eaa29
Fix fisher depth to vanilla like (#9961)
someaddons May 23, 2024
7ececda
Fixes (#9964)
someaddons May 26, 2024
a924cd7
fix john exploit (#9962)
Raycoms May 26, 2024
391b6eb
Only hit at line of sight (#9966)
Raycoms May 29, 2024
6c8b62c
Minecolonies Original fix and Jungle Treehouse tweak (#9960)
MotionlessTrain May 29, 2024
f2f87d3
Central Courier Task Assignment (#9969)
Raycoms Jun 2, 2024
2916429
New patreon pattern + name (#9978)
Raycoms Jun 8, 2024
46f0b03
Fix the tags in the Nordic Spruce vine plantation field (#9971)
MotionlessTrain Jun 8, 2024
cadb39a
[ImgBot] Optimize images (#9979)
imgbot[bot] Jun 9, 2024
758292b
avoid nearby colony lookup on each frame (#9972)
someaddons Jun 9, 2024
b5be09c
Prevent builder from standing where hes mining below (#9981)
someaddons Jun 10, 2024
3bd2f2c
Further quest progress (#9980)
Raycoms Jun 11, 2024
1ac11d4
Improve fisher (#9986)
Raycoms Jun 16, 2024
04a4bed
Caledonia and Pagoda updates (#9984)
MotionlessTrain Jun 16, 2024
4b36e23
Mark the Fortress mine guard as invisible (#9983)
MotionlessTrain Jun 16, 2024
ddd0e0e
Some perm changes (#9989)
Raycoms Jun 16, 2024
81506ec
Update greek texture style to include all (#9998)
Raycoms Jun 23, 2024
1a53fd5
Rack fixes (#9997)
someaddons Jun 23, 2024
4dc8f6d
Fix enum naming for direction for raids (#9995)
Thodor12 Jun 23, 2024
aa99e63
Rework the quarrier to support other builder modes in the future (#9967)
MotionlessTrain Jun 23, 2024
4f0b3b8
[ImgBot] Optimize images (#10000)
imgbot[bot] Jun 23, 2024
b7e329e
Medieval and Ancient Athens fixes (#10002)
MotionlessTrain Jun 23, 2024
b56452e
Some pickup changes & UI include warehouse list (#9992)
Raycoms Jun 23, 2024
0c36610
Add kitchen placeholder (#10001)
Raycoms Jun 24, 2024
8c202cc
courier adjutment + sleep adjustments (#10004)
Raycoms Jun 28, 2024
b46a5e4
blame sam, hotfix
Raycoms Jun 28, 2024
37ebfac
TeamCity change in 'Let's Dev Together / Minecolonies / Branches' pro…
Jun 29, 2024
c5bc785
fix npe (#10014)
Raycoms Jul 5, 2024
f1b460a
Fortress, Shire and Medieval Birch fixes (#10007)
MotionlessTrain Jul 7, 2024
2805241
Fix workers not displaying request when converting an async request t…
someaddons Jul 7, 2024
52916bc
fix #10010 (#10017)
Raycoms Jul 7, 2024
ea3b39c
Migrate to new structure operations in favor of ticked world operatio…
Thodor12 Jul 7, 2024
446ca3a
Minecolonies food (#10018)
Raycoms Jul 14, 2024
772448f
Cavern and Ancient Athens fixes (#10027)
MotionlessTrain Jul 14, 2024
72dedc7
Schematic kitchen preparations (#10005)
MotionlessTrain Jul 14, 2024
2c8e3c8
fix 10035 & 10036 (#10040)
Raycoms Jul 15, 2024
2c235d9
Cookery fixes (#10041)
Raycoms Jul 16, 2024
a32b96c
Allow teaching crafting recipes to kitchen at levels 1-2 (#10048)
uecasm Jul 17, 2024
4c5aba7
Allow rice to actually drop :D (#10058)
uecasm Jul 20, 2024
981f0b4
Food related fixe (#10054)
Raycoms Jul 20, 2024
a53091c
Medieval, Desert Oasis, Minecolonies and Colonial additions, Medieval…
MotionlessTrain Jul 20, 2024
fb5a4b3
Fixes crash if rack next to hut (#10056)
uecasm Jul 21, 2024
76a34d5
Quarrier tweaks (#10052)
MotionlessTrain Jul 21, 2024
a3058a4
Don't treat domum items as equivalent when reporting resource deliver…
uecasm Jul 21, 2024
a0fb1bc
fix 10047 (#10064)
Raycoms Jul 21, 2024
71ef82f
Tool handling (#10051)
Raycoms Jul 21, 2024
2300eae
Fix food auditor for new food system (#10059)
uecasm Jul 21, 2024
e7b566b
Fix clicking on arrow to get possible recipes (#10067)
uecasm Jul 22, 2024
d66392a
John's cookeries (#10065)
MotionlessTrain Jul 22, 2024
5e7798a
Whoops (#10070)
uecasm Jul 23, 2024
af8b40f
Ware balance (#10076)
Raycoms Jul 28, 2024
4a5e79e
Add new jugs and seperate loottables (#10072)
Raycoms Jul 28, 2024
ef4f68e
Add mud bricks to paths and sanity-fix the dyer (#9894)
uecasm Jul 28, 2024
ec95859
Rollback of all modified colonial files (#10086)
Thodor12 Aug 1, 2024
ea95852
Redo everything but the military files in colonial (#10088)
Thodor12 Aug 2, 2024
f914997
Some fixes (#10085)
someaddons Aug 4, 2024
0162911
Ye daft crafter, ye cannae make buckets from bottles (#10081)
uecasm Aug 4, 2024
79f9335
Evaluate loot pool conditions too (#10090)
uecasm Aug 4, 2024
90c9f41
Cavern additions, Colonial and Fortress fixes in 1.20.1 (#10096)
MotionlessTrain Aug 8, 2024
9751d73
Update CitizenHappinessHandler.java (#10099)
Thodor12 Aug 8, 2024
826a5a1
hotfix entity toggle no longer done slow sure check
someaddons Aug 9, 2024
cdfa65d
Small improvements (#10101)
Raycoms Aug 9, 2024
88486b5
Resilient rs (#10107)
Raycoms Aug 11, 2024
29a4a4d
Lost Mesa City, Minecolonies Original and Colonial fixes in 1.20 (#10…
MotionlessTrain Aug 11, 2024
a197154
Dynamic trees re-compat (#9706)
uecasm Aug 11, 2024
f313f13
Send incompatible mods to the logs for easier recognition (#10100)
Thodor12 Aug 11, 2024
f9199c9
more resilience (#10111)
someaddons Aug 11, 2024
900d20f
resilience++ (#10110)
Raycoms Aug 11, 2024
e625d6f
Fix compost application rules to Minecolonies crops (#10104)
Thodor12 Aug 11, 2024
e62624a
add new gitignore
Raycoms Aug 12, 2024
dbf9666
Pagoda additions, Spacewars change and Fortress fix in 1.20.1 (#10116)
MotionlessTrain Aug 15, 2024
e806fa9
Caledonia cookery (#10121)
MotionlessTrain Aug 16, 2024
1571176
Smallfixes (#10120)
someaddons Aug 16, 2024
bc1f926
TeamCity change in 'Let's Dev Together / Minecolonies / Beta' project…
Aug 16, 2024
46e66f8
actions
Raycoms Aug 18, 2024
74304e3
use forge
Raycoms Aug 18, 2024
5fd25d6
Several fixes for bottles and mod compilationn errors (#10126)
Thodor12 Aug 18, 2024
6400925
Thodor12 patch 1 (#10128)
Thodor12 Aug 18, 2024
9772c6b
Give permission to write packages
marchermans Aug 18, 2024
28a194c
Sync and other improvements (#10135)
someaddons Aug 20, 2024
d15fb4c
fix 10132 (#10134)
Raycoms Aug 20, 2024
c7e59c9
Try catch events we post (#10139)
Raycoms Aug 20, 2024
e185b01
Only deserialize valid requestresolveidentities (#10140)
Raycoms Aug 20, 2024
bb16d07
Fix/double warehouse (#10149)
Raycoms Aug 22, 2024
9bc7f4c
Pathing improvement (#10148)
Raycoms Aug 22, 2024
659260c
Fix mercenary rendering
Raycoms Aug 23, 2024
bf48b18
Fix build pipeline [internal] (#10141)
Thodor12 Aug 23, 2024
a779517
Give baker a chance to return all kinds of bottles (#10153)
uecasm Aug 25, 2024
95bb1de
Add a few npe fixes and small adjustments to info commands (#10161)
someaddons Aug 25, 2024
4f972e8
Fix npe with bad crafting recipes after e.g. mod removal (#10163)
someaddons Aug 25, 2024
597d985
Prevent some crashes (#10180)
someaddons Aug 31, 2024
843d442
Rescan of Caledonia warehouse (#10154)
MotionlessTrain Sep 5, 2024
bce345d
Fix pepper hummus (#10178)
uecasm Sep 5, 2024
8d716e4
Do not run needless patreon auth checks (#10136)
Thodor12 Sep 5, 2024
7ca65b1
Make pond actually check for what is on wiki (#10175)
Raycoms Sep 5, 2024
606bfe7
Update actions files, gradle files, cleanup (#10198)
Thodor12 Sep 5, 2024
7bf21f0
crowdin
Raycoms Sep 5, 2024
2b5da24
Ray fixes (#10201)
Raycoms Sep 8, 2024
f0ca7ea
fix port compile errors
Raycoms Sep 8, 2024
6ddf530
Fix versioning for 1.20 with new OPC update (#10205)
Thodor12 Sep 8, 2024
80bb962
resilience improvement (#10206)
Raycoms Sep 9, 2024
d5b3bae
hotfix oopsy
Raycoms Sep 9, 2024
c44094e
correct order
Raycoms Sep 9, 2024
ff5c220
Fix translations:tm:
Raycoms Sep 10, 2024
26ba392
Pagoda rescan and Fortress fix in 1.20.1 (#10216)
MotionlessTrain Sep 15, 2024
26305f9
Update AbstractWarehouseRequestResolver.java (#10213)
Wmaxlees Sep 15, 2024
dd7a489
Fix time based happiness working as expected (#10196)
Thodor12 Sep 15, 2024
ab33551
Tool registry (#10190)
Wmaxlees Sep 15, 2024
ad28aad
Add biome tag audit (#10080)
uecasm Sep 15, 2024
eda970a
Buildtool descriptions (#10089)
someaddons Sep 15, 2024
bf1dc33
Fix/warehouse issue (#10218)
Raycoms Sep 15, 2024
c30a69b
Fix a crash upon deserialization of equipment types in recipes (#10221)
Thodor12 Sep 15, 2024
b2496bf
Fix inability resolve warehouse requests (#10224)
Thodor12 Sep 16, 2024
6ab992c
solve request issues (#10232)
Raycoms Sep 19, 2024
9204d79
Fortress plantation fields and dyer's hut fix in 1.20.1 (#10228)
MotionlessTrain Sep 19, 2024
365fa61
Fix guards unable to request shields (#10227)
Thodor12 Sep 19, 2024
29bd2a3
Update crafterfemale1_b.png (#10268)
Imrielle Sep 27, 2024
a41cd15
Fortress, Incan, Medieval Birch and Medieval Dark Oak fixes in 1.20.1…
MotionlessTrain Sep 29, 2024
41ea937
Fix kitchen resolving food requests that are not taught (#10288)
Thodor12 Sep 29, 2024
832c601
Various fixes and Improvements (#10242)
someaddons Sep 29, 2024
5938e37
things shouldn't crash (#10284)
Raycoms Sep 29, 2024
a4bdd24
Fix deserialization error after removing a mod that adds a job (#10275)
uecasm Sep 29, 2024
b359cc9
Remove some unnecessary artifacts from being deployed (#10256)
Thodor12 Sep 29, 2024
988276d
Spacewars and Medieval Oak fixes and Minecolonies Original and Coloni…
MotionlessTrain Sep 29, 2024
b0b29a4
Pagoda and Desert Oasis fixes in 1.20.1 (#10298)
MotionlessTrain Oct 4, 2024
7066c5c
Fix explicit requests for recipes (#10310)
uecasm Oct 5, 2024
2442d99
prevent rs crash (#10319)
Raycoms Oct 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minecolonies Original fix and Jungle Treehouse tweak (ldtteam#9960)
Jungle Treehouse:
Replace vines with placeholders in the university to make upgrading easier
Minecolonies Original:
Fix the duplicate ground level tag in the dyer's hut
  • Loading branch information
MotionlessTrain authored May 29, 2024
commit 6c8b62cc8ebd8dd59e61ac904c62b163e3650ea7
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.