Code

merge vbm + merge fixes#584

Code

Merged

CarnifexOptimus merged 45 commits intomainFFXIV-CombatReborn/BossmodReborn:mainfrom mergeWIPFFXIV-CombatReborn/BossmodReborn:mergeWIPCopy head branch name to clipboardJan 29, 2025

+9,007-2,095

Commits

Commits on Jan 19, 2025

• less spaghetti

  Akechi-kun

  committed
  0726071

  Copy full SHA for 0726071

• forgot this

  Akechi-kun

  committed
  f7e711c

  Copy full SHA for f7e711c

• good to go for now, more opti later

  Akechi-kun

  committed
  104f9b1

  Copy full SHA for 104f9b1

• this caused issues oops

  Akechi-kun

  committed
  30c2105

  Copy full SHA for 30c2105

• Scathe has too much prio here, adjusted this

  Akechi-kun

  committed
  1aaff43

  Copy full SHA for 1aaff43

• wait what?

  Akechi-kun

  committed
  de8e702

  Copy full SHA for de8e702

• cooked

  Akechi-kun

  committed
  df275f4

  Copy full SHA for df275f4

• pesky little shits

  Akechi-kun

  committed
  fb8a08a

  Copy full SHA for fb8a08a

• some opti stuff, Fire III opener

  Akechi-kun

  committed
  1b3ab0f

  Copy full SHA for 1b3ab0f

Commits on Jan 20, 2025

• more de-spaghetting

  Akechi-kun

  committed
  b72f645

  Copy full SHA for b72f645

• more changes haha yayyyy

  xanunderscore

  committed
  a9f4e5f

  Copy full SHA for a9f4e5f

• goodbye

  xanunderscore

  committed
  70d2899

  Copy full SHA for 70d2899

• targeting update

  Akechi-kun

  committed
  42594cc

  Copy full SHA for 42594cc

• properties

  xanunderscore

  committed
  f922e9c

  Copy full SHA for f922e9c

Commits on Jan 21, 2025

• deep dungeon state wip

  xanunderscore

  committed
  8c58918

  Copy full SHA for 8c58918

Commits on Jan 22, 2025

• Merge branch 'awgil:master' into REEEEEEEEEEEEEEEEE

  Akechi-kun

  authored
  bbaafc8

  Copy full SHA for bbaafc8

Commits on Jan 25, 2025

• lol

  xanunderscore

  committed
  a68341e

  Copy full SHA for a68341e

• oop

  xanunderscore

  committed
  d2537eb

  Copy full SHA for d2537eb

• add missing crap

  xanunderscore

  committed
  af1f1b6

  Copy full SHA for af1f1b6

• Initial version of auto-farm module.

  awgil

  committed
  3c25c1b

  Copy full SHA for 3c25c1b

• build warnings

  xanunderscore

  committed
  6bab20d

  Copy full SHA for 6bab20d

• Merge branch 'awgil:master' into REEEEEEEEEEEEEEEEE

  Akechi-kun

  authored
  bae60c5

  Copy full SHA for bae60c5

• opti

  Akechi-kun

  committed
  b7a4f56

  Copy full SHA for b7a4f56

Commits on Jan 26, 2025

• More target filters

  awgil

  committed
  cc23baa

  Copy full SHA for cc23baa

• Merge pull request #570 from Akechi-kun/REEEEEEEEEEEEEEEEE

  Show description for e72d48c
  awgil

  authored
  e72d48c

  Copy full SHA for e72d48c

• Merge branch 'master' into xanagain

  awgil

  authored
  74c6c8a

  Copy full SHA for 74c6c8a

• Merge pull request #571 from xanunderscore/xanagain

  Show description for 5d27986
  awgil

  authored
  5d27986

  Copy full SHA for 5d27986

• Removed weird dependency from actor to aihints.

  awgil

  committed
  cde4c70

  Copy full SHA for cde4c70

• Merge pull request #572 from xanunderscore/dd

  Show description for 5e2f394
  awgil

  authored
  5e2f394

  Copy full SHA for 5e2f394

• Stylistic changes.

  awgil

  committed
  c7748d5

  Copy full SHA for c7748d5

• Merge pull request #574 from xanunderscore/questmods

  Show description for 2080f5e
  awgil

  authored
  2080f5e

  Copy full SHA for 2080f5e

• Moved rotation module yet again.

  awgil

  committed
  da7bd21

  Copy full SHA for da7bd21

• Replay version bump, so that I can write converters for DD later.

  awgil

  committed
  f51da49

  Copy full SHA for f51da49

• DD replay conversion.

  awgil

  committed
  239dcad

  Copy full SHA for 239dcad

• fix steps of faith class name

  xanunderscore

  authored
  9b53c04

  Copy full SHA for 9b53c04

• fix MNK in default preset

  xanunderscore

  authored
  05bbfc2

  Copy full SHA for 05bbfc2

• JSON conversion utility.

  awgil

  committed
  f4376dd

  Copy full SHA for f4376dd

• Merge pull request #575 from xanunderscore/patch-16

  Show description for f201b32
  awgil

  authored
  f201b32

  Copy full SHA for f201b32

• Merge pull request #576 from xanunderscore/patch-17

  Show description for 7ddc97d
  awgil

  authored
  7ddc97d

  Copy full SHA for 7ddc97d

• Kill dupe modules.

  awgil

  committed
  289900b

  Copy full SHA for 289900b

• New category for chaotic raids.

  awgil

  committed
  5b59d13

  Copy full SHA for 5b59d13

• Preparation for preset/plan converters.

  awgil

  committed
  c9262ee

  Copy full SHA for c9262ee

Commits on Jan 27, 2025

• fixed comments

  CarnifexOptimus

  committed
  d71e673

  Copy full SHA for d71e673

Commits on Jan 29, 2025

• Merge branch 'merge' into mergeWIP

  CarnifexOptimus

  committed
  f86357f

  Copy full SHA for f86357f

• merge fixes

  CarnifexOptimus

  committed
  7e1ecfe

  Copy full SHA for 7e1ecfe