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.

Sign up for GitHub

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

Jump to bottom

Colony expedition system #10113

Closed
wants to merge 123 commits into from
Closed

Colony expedition system #10113

wants to merge 123 commits into from

Commits on Jan 14, 2024

  1. Temp

    @Thodor12
    Thodor12 committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    88ce1d8 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Finish off visitor type system

    @Thodor12
    Thodor12 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    da9e661 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/visitor_types

    @Thodor12
    Thodor12 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    916d80d View commit details
    Browse the repository at this point in the history

  3. Final

    @Thodor12
    Thodor12 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    35c7eb2 View commit details
    Browse the repository at this point in the history

  4. Fix

    @Thodor12
    Thodor12 committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    513380e View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Merge branch 'version/main' into feature/visitor_types 

    # Conflicts:
#	src/api/java/com/minecolonies/api/colony/IVisitorData.java
#	src/main/java/com/minecolonies/apiimp/initializer/EntityInitializer.java
#	src/main/java/com/minecolonies/core/MineColonies.java
#	src/main/java/com/minecolonies/core/colony/interactionhandling/RecruitmentInteraction.java
#	src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java
#	src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java
#	src/main/java/com/minecolonies/core/datalistener/CustomVisitorListener.java
#	src/main/java/com/minecolonies/core/entity/ai/visitor/EntityAIVisitor.java
#	src/main/java/com/minecolonies/core/entity/citizen/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    1d61cd2 View commit details
    Browse the repository at this point in the history

  2. Fixes

    @Thodor12
    Thodor12 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    5ca75e1 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Port expeditions

    @Thodor12
    Thodor12 committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    871f59f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Lot of fixes

    @Thodor12
    Thodor12 committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    c0b2b71 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Temp

    @Thodor12
    Thodor12 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    3fefe0f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/visitor_types 

    # Conflicts:
#	src/main/java/com/minecolonies/api/IMinecoloniesAPI.java
#	src/main/java/com/minecolonies/api/MinecoloniesAPIProxy.java
#	src/main/java/com/minecolonies/apiimp/CommonMinecoloniesAPIImpl.java
#	src/main/java/com/minecolonies/apiimp/initializer/EntityInitializer.java
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    9719e45 View commit details
    Browse the repository at this point in the history

  3. Move

    @Thodor12
    Thodor12 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    74a655a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/visitor_types' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/api/colony/managers/interfaces/IExpeditionManager.java
#	src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java
    @Thodor12
    Thodor12 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    c309ff5 View commit details
    Browse the repository at this point in the history

  5. Move

    @Thodor12
    Thodor12 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    06bb8cb View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    1cb0b13 View commit details
    Browse the repository at this point in the history

  2. Fixes

    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    63e435e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'version/main' into feature/visitor_types

    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3abacb1 View commit details
    Browse the repository at this point in the history

  4. Fix

    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    ab04bb8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/visitor_types' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3f5a362 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'version/main' into feature/visitor_types 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    99a600d View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Temp

    @Thodor12
    Thodor12 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    90771e4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    6be5771 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'version/main' into feature/visitor_types

    @Thodor12
    Thodor12 authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    9fe28ba View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Temp

    @Thodor12
    Thodor12 committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    befff5c View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    af5148f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    696725d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/visitor_types

    @Thodor12
    Thodor12 authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    506a9c3 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Expedition spawning works

    @Thodor12
    Thodor12 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    d1cc472 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	gradle.properties
    @Thodor12
    Thodor12 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    ac9b1ec View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    78ba4c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Starting expeditions fully functional

    @Thodor12
    Thodor12 committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    aa2602c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    e247aca View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Ending expeditions

    @Thodor12
    Thodor12 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    78f2231 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Start townhall UI

    @Thodor12
    Thodor12 committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    0d4f7d4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/visitor_types

    @Thodor12
    Thodor12 committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    9778f15 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/visitor_types' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    27cbc57 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/api/util/constant/NbtTagConstants.java
#	src/main/java/com/minecolonies/core/event/FMLEventHandler.java
#	src/main/java/com/minecolonies/core/network/NetworkChannel.java
#	src/main/resources/assets/minecolonies/lang/manual_en_us.json
    @Thodor12
    Thodor12 committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    45c3eda View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Update

    @Thodor12
    Thodor12 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    96d5697 View commit details
    Browse the repository at this point in the history

  2. Updates to GUI

    @Thodor12
    Thodor12 committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    04c4bce View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Start of the details for expeditions

    @Thodor12
    Thodor12 committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    260673e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    254dd9f View commit details
    Browse the repository at this point in the history

  2. Updates

    @Thodor12
    Thodor12 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    03b0a95 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
#	src/main/java/com/minecolonies/core/event/FMLEventHandler.java
    @Thodor12
    Thodor12 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    b2a7ff7 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c9400d1 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    56c4122 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Member serialization fixes

    @Thodor12
    Thodor12 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    25e0403 View commit details
    Browse the repository at this point in the history

  2. Scaling mob fights and better structure handling

    @Thodor12
    Thodor12 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    4e291e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    266045a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    13d17ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120

# Conflicts:
#	gradle.properties
#	src/main/java/com/minecolonies/api/colony/ICitizenDataView.java
#	src/main/java/com/minecolonies/api/colony/IVisitorData.java
#	src/main/java/com/minecolonies/apiimp/initializer/ModColonyEventTypeInitializer.java
#	src/main/java/com/minecolonies/core/colony/VisitorData.java
#	src/main/java/com/minecolonies/core/colony/VisitorDataView.java
#	src/main/java/com/minecolonies/core/colony/buildings/modules/BuildingResourcesModule.java
#	src/main/java/com/minecolonies/core/colony/managers/VisitorManager.java
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
#	src/main/java/com/minecolonies/core/event/EventHandler.java
#	src/main/resources/assets/minecolonies/lang/manual_en_us.json
    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    305e415 View commit details
    Browse the repository at this point in the history

  3. Fix

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    9ed0e49 View commit details
    Browse the repository at this point in the history

  4. Fixes

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    4a44137 View commit details
    Browse the repository at this point in the history

  5. Fixes

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    b725644 View commit details
    Browse the repository at this point in the history

  6. Imports

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    f05b86f View commit details
    Browse the repository at this point in the history

  7. Undo custom texture visitor data

    @Thodor12
    Thodor12 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    1249aa3 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Update

    @Thodor12
    Thodor12 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    e532f0b View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Update

    @Thodor12
    Thodor12 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    ec15ca6 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120

# Conflicts:
#	src/main/java/com/minecolonies/apiimp/initializer/ModColonyEventTypeInitializer.java
#	src/main/resources/assets/minecolonies/lang/manual_en_us.json
    @Thodor12
    Thodor12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    590cde6 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Update

    @Thodor12
    Thodor12 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    ec1f490 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Update interaction with expedition sheet

    @Thodor12
    Thodor12 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    f587a82 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Fix interaction with guards list

    @Thodor12
    Thodor12 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ac7a34e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120

# Conflicts:
#	gradle.properties
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    7e6734f View commit details
    Browse the repository at this point in the history

  3. Fixes

    @Thodor12
    Thodor12 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    722327b View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120
    @Thodor12
    Thodor12 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    a642571 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    c5343d9 View commit details
    Browse the repository at this point in the history

  2. Fixes

    @Thodor12
    Thodor12 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    d17e795 View commit details
    Browse the repository at this point in the history

  3. Create datagenerators

    @Thodor12
    Thodor12 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    95d8bae View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Update datagenerators

    @Thodor12
    Thodor12 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    79ac2b7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120
    @Thodor12
    Thodor12 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    56d0e79 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Fixes

    @Thodor12
    Thodor12 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    9f4f902 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Start filling loot tables

    @Thodor12
    Thodor12 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    03850b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120

# Conflicts:
#	gradle.properties
#	src/datagen/generated/minecolonies/assets/minecolonies/sounds.json
#	src/main/java/com/minecolonies/core/event/EventHandler.java
#	src/main/resources/assets/minecolonies/lang/manual_en_us.json
    @Thodor12
    Thodor12 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    51ff3cd View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120
    @Thodor12
    Thodor12 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    0455b53 View commit details
    Browse the repository at this point in the history

  2. Allow expedition difficulty as a loot param

    @Thodor12
    Thodor12 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    b94ca33 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. First 5 structure loot tables

    @Thodor12
    Thodor12 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    75f9b47 View commit details
    Browse the repository at this point in the history

  2. Mansion loot table

    @Thodor12
    Thodor12 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    7337972 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Allow several structures in a row not to create new stages and armor … 

    …usage damage
    @Thodor12
    Thodor12 committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    7a76cab View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Removed luck from impacting loot tables, created and modified a bunch… 

    … of other structure loot
    @Thodor12
    Thodor12 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    0af7e24 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120

# Conflicts:
#	src/main/java/com/minecolonies/core/event/EventHandler.java
#	src/main/resources/assets/minecolonies/lang/manual_en_us.json
    @Thodor12
    Thodor12 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    013aea7 View commit details
    Browse the repository at this point in the history

  2. Fix

    @Thodor12
    Thodor12 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    2af0eaf View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'refs/heads/version/main' into feature/colony_expedition… 

    …s_120
    @Thodor12
    Thodor12 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    9c4028d View commit details
    Browse the repository at this point in the history

  2. Lots more loot tables

    @Thodor12
    Thodor12 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    36e438b View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Add ruined portal, remove qualities

    @Thodor12
    Thodor12 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    8771b0f View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. Last structure loot tables

    @Thodor12
    Thodor12 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    770b99b View commit details
    Browse the repository at this point in the history

  2. Remove ocean ruins

    @Thodor12
    Thodor12 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    33db988 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Revert build.gradle

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    92c0de9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    08b7a6d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/colony/interactionhandling/RecruitmentInteraction.java
    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    cd40c92 View commit details
    Browse the repository at this point in the history

  4. Update datagen (please don't bork everything)

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    6c0bff5 View commit details
    Browse the repository at this point in the history

  5. Fix datagen

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    40e6362 View commit details
    Browse the repository at this point in the history

  6. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9a0edf9 View commit details
    Browse the repository at this point in the history

  7. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    a993b86 View commit details
    Browse the repository at this point in the history

  8. Javadoc

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9c5d382 View commit details
    Browse the repository at this point in the history

  9. Javadoc

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d5f1abd View commit details
    Browse the repository at this point in the history

  10. Remove

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    1f97eea View commit details
    Browse the repository at this point in the history

  11. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    a7df0e2 View commit details
    Browse the repository at this point in the history

  12. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d8a0aca View commit details
    Browse the repository at this point in the history

  13. Update

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    e9a8d20 View commit details
    Browse the repository at this point in the history

  14. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d471237 View commit details
    Browse the repository at this point in the history

  15. Undo

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    7035705 View commit details
    Browse the repository at this point in the history

  16. Update

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    83c54ab View commit details
    Browse the repository at this point in the history

  17. Rename

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    f663160 View commit details
    Browse the repository at this point in the history

  18. Javadoc

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9b122e9 View commit details
    Browse the repository at this point in the history

  19. Javadoc

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    fd8ec6d View commit details
    Browse the repository at this point in the history

  20. Javadoc and update

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    059aecd View commit details
    Browse the repository at this point in the history

  21. Allow void input materials

    @Thodor12
    Thodor12 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9be0990 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Start generation of expedition loot tables themselves + fixes

    @Thodor12
    Thodor12 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    15340bb View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Update expedition difficulty param to support multiple difficulties a… 

    …t once, pass over all structures to implement more difficulty locks
    @Thodor12
    Thodor12 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    bdef08f View commit details
    Browse the repository at this point in the history

  2. Start generation of expedition loot tables

    @Thodor12
    Thodor12 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d66de15 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    317d1a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0f2aaa0 View commit details
    Browse the repository at this point in the history

  2. Updates

    @Thodor12
    Thodor12 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    f5056f7 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    bd6afc1 View commit details
    Browse the repository at this point in the history

  2. Add textures

    @Thodor12
    Thodor12 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    68de0c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/event/EventHandler.java
    @Thodor12
    Thodor12 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    b966114 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Updates

    @Thodor12
    Thodor12 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    3975fa7 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    7760b64 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
    @Thodor12
    Thodor12 committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    11dfee5 View commit details
    Browse the repository at this point in the history

  2. Bugfixes

    @Thodor12
    Thodor12 committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    ed5f875 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Improve setup

    @Thodor12
    Thodor12 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    bde7c2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'version/main' into feature/colony_expeditions_120 

    # Conflicts:
#	src/main/java/com/minecolonies/api/util/InventoryUtils.java
    @Thodor12
    Thodor12 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    bb5a8a0 View commit details
    Browse the repository at this point in the history

  3. Conversion to equipment type from tool type

    @Thodor12
    Thodor12 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    4c06816 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Merge branch 'version/main' into feature/colony_expeditions_120

    @Thodor12
    Thodor12 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e015f9f View commit details
    Browse the repository at this point in the history