Code

Sync 2.2.X branch with main#697

Code

Closed

BenCheung0422 wants to merge 146 commits into2.2.XMinicraftPlus/minicraft-plus-revived:2.2.Xfrom mainMinicraftPlus/minicraft-plus-revived:mainCopy head branch name to clipboard

+7,497-8,565

Commits

Commits on Mar 4, 2023

• Add ColorSet to Sheep.java

  BenCheung0422

  committed
  18d4526

  Copy full SHA for 18d4526

• Update Sheep.java

  BenCheung0422

  committed
  16f51aa

  Copy full SHA for 16f51aa

Commits on Apr 5, 2023

• Add dye items

  BenCheung0422

  committed
  4b2b471

  Copy full SHA for 4b2b471

• Fix sheep dying not working

  BenCheung0422

  committed
  a7b92cc

  Copy full SHA for a7b92cc

Commits on Apr 6, 2023

• Add dye item recipes

  BenCheung0422

  committed
  552bb6d

  Copy full SHA for 552bb6d

• Merge branch 'farming' into color

  BenCheung0422

  committed
  0fa5d7a

  Copy full SHA for 0fa5d7a

• Update recipes.json for dye recipes

  BenCheung0422

  committed
  a234983

  Copy full SHA for a234983

Commits on Apr 12, 2023

• Natural spawned colored sheep implementation

  BenCheung0422

  committed
  d8e1289

  Copy full SHA for d8e1289

Commits on Apr 13, 2023

• Wool implementation by color system update

  BenCheung0422

  committed
  6a265f2

  Copy full SHA for 6a265f2

Commits on Apr 14, 2023

• Merge branch 'farming' into color

  BenCheung0422

  committed
  1c583ce

  Copy full SHA for 1c583ce

• Resolve problem by merging

  BenCheung0422

  committed
  87ec11a

  Copy full SHA for 87ec11a

• Changed wool into white wool in chestloot table

  BenCheung0422

  committed
  f04df2d

  Copy full SHA for f04df2d

• Complement of recipes of dye composites

  BenCheung0422

  committed
  616d2ab

  Copy full SHA for 616d2ab

• Complement of wool recipes

  BenCheung0422

  committed
  1bdf159

  Copy full SHA for 1bdf159

• Add string to white wool recipe

  BenCheung0422

  committed
  4f9430f

  Copy full SHA for 4f9430f

• Colored bed implementation by color system update

  BenCheung0422

  committed
  9b546e1

  Copy full SHA for 9b546e1

Commits on Apr 15, 2023

• Fix invalid wool request into white wool

  BenCheung0422

  committed
  b603f51

  Copy full SHA for b603f51

• Complementation on bed recipes

  BenCheung0422

  committed
  d11f373

  Copy full SHA for d11f373

Commits on Apr 16, 2023

• Add recipe unlocking advancement generator

  BenCheung0422

  committed
  f761754

  Copy full SHA for f761754

Commits on May 14, 2023

• Update ChangeLog.md

  BenCheung0422

  committed
  e57757e

  Copy full SHA for e57757e

• Merge branch 'main' into color

  BenCheung0422

  authored
  415ad61

  Copy full SHA for 415ad61

Commits on Jun 21, 2023

• Update recipes.json

  BenCheung0422

  committed
  39b1e91

  Copy full SHA for 39b1e91

• Fix small problems

  BenCheung0422

  committed
  029e98f

  Copy full SHA for 029e98f

• Update recipes.json

  BenCheung0422

  committed
  3a4c882

  Copy full SHA for 3a4c882

Commits on Jun 23, 2023

• Merge branch 'farming' into color

  BenCheung0422

  committed
  319e788

  Copy full SHA for 319e788

Commits on Jul 10, 2023

• Add more flowers

  Show description for 3d97ce9
  BenCheung0422

  committed
  3d97ce9

  Copy full SHA for 3d97ce9

• Merge branch 'farming' into color

  BenCheung0422

  committed
  8550872

  Copy full SHA for 8550872

• Update tile IDs

  Show description for f16516b
  BenCheung0422

  committed
  f16516b

  Copy full SHA for f16516b

• Add recipes for more flowers

  BenCheung0422

  committed
  467dbb4

  Copy full SHA for 467dbb4

Commits on Jul 13, 2023

• Combine flower tiles into tile data

  BenCheung0422

  committed
  f558d20

  Copy full SHA for f558d20

Commits on Aug 22, 2023

• Add ExplosionTileTicker to replace explosion replacements

  BenCheung0422

  committed
  b8f18fd

  Copy full SHA for b8f18fd

Commits on Oct 10, 2023

• Revert changes related to #574

  Show description for 9bab402
  BenCheung0422

  committed
  9bab402

  Copy full SHA for 9bab402

Commits on Dec 30, 2023

• Merge remote-tracking branch 'upstream/main' into color

  Show description for 62bfed2
  BenCheung0422

  committed
  62bfed2

  Copy full SHA for 62bfed2

Commits on Jan 9, 2024

• Add number getters for Version

  BenCheung0422

  committed
  b113394

  Copy full SHA for b113394

• Add world and preferences backups

  BenCheung0422

  committed
  b384164

  Copy full SHA for b384164

Commits on Jan 10, 2024

• Delete bed.png

  Show description for 6756836
  BenCheung0422

  committed
  6756836

  Copy full SHA for 6756836

Commits on Jan 20, 2024

• Fix spacings in Tiles.java

  BenCheung0422

  committed
  c82a951

  Copy full SHA for c82a951

Commits on Feb 3, 2024

• Merge branch 'main' into color

  Litorom

  authored
  258bb72

  Copy full SHA for 258bb72

Commits on Feb 13, 2024

• Remove Version#get...()

  BenCheung0422

  committed
  a0a84bd

  Copy full SHA for a0a84bd

• Resolve removal error

  BenCheung0422

  committed
  399aa57

  Copy full SHA for 399aa57

Commits on Feb 16, 2024

• Simplify Inventory#add

  BenCheung0422

  committed
  c40adde

  Copy full SHA for c40adde

Commits on Feb 27, 2024

• Move to check drop-stack first

  BenCheung0422

  committed
  28f8b34

  Copy full SHA for 28f8b34

• Resolve unresolved AIOOBE on menus in PlayerInv

  BenCheung0422

  committed
  8dfb3ef

  Copy full SHA for 8dfb3ef

Commits on Mar 28, 2024

• Merge remote-tracking branch 'upstream/main' into color

  BenCheung0422

  committed
  4176b7c

  Copy full SHA for 4176b7c

• World generation for new flower variants

  BenCheung0422

  committed
  1d9ba22

  Copy full SHA for 1d9ba22

Commits on Apr 11, 2024

• Simplify screenshot feature

  BenCheung0422

  committed
  a4e6fb5

  Copy full SHA for a4e6fb5

Commits on Apr 18, 2024

• Merge branch 'main' into patch-71

  Litorom

  authored
  46617b5

  Copy full SHA for 46617b5

• Simplify screenshot feature (#660)

  Litorom

  authored
  71e739c

  Copy full SHA for 71e739c

Commits on Apr 21, 2024

• Change Display Menu changing to as "cursor"-mapped

  BenCheung0422

  committed
  2726481

  Copy full SHA for 2726481

Commits on Apr 22, 2024

• Merge remote-tracking branch 'upstream/main' into patch-66

  Show description for 69bbf17
  BenCheung0422

  committed
  69bbf17

  Copy full SHA for 69bbf17

• Fix unmatching change to the container menus

  BenCheung0422

  committed
  7c8cfde

  Copy full SHA for 7c8cfde

Commits on Apr 23, 2024

• Update entries to reflect recent version

  Litorom

  authored
  f7c6417

  Copy full SHA for f7c6417

Commits on Apr 25, 2024

• Merge remote-tracking branch 'upstream/main' into color

  Show description for 94035da
  BenCheung0422

  committed
  94035da

  Copy full SHA for 94035da

Commits on Apr 26, 2024

• Fix flower problems

  Show description for 4ff39c3
  BenCheung0422

  committed
  4ff39c3

  Copy full SHA for 4ff39c3

Commits on Apr 29, 2024

• Merge branch 'main' into patch-72

  Litorom

  authored
  d22686e

  Copy full SHA for d22686e

Commits on Apr 30, 2024

• Push localizations from Lokalise

  BenCheung0422

  committed
  06bb7c5

  Copy full SHA for 06bb7c5

Commits on May 1, 2024

• Turn most * and / 16 to bit shifts

  BenCheung0422

  committed
  e24dd75

  Copy full SHA for e24dd75

• Minimally optimize light rendering

  Show description for fcbd867
  BenCheung0422

  committed
  fcbd867

  Copy full SHA for fcbd867

• Push localizations from Lokalise (#676)

  Litorom

  authored
  95849c9

  Copy full SHA for 95849c9

• Add OpenGL HWA option

  BenCheung0422

  committed
  48adf4f

  Copy full SHA for 48adf4f

• Add option entry and popup for HWA

  BenCheung0422

  committed
  d01deb3

  Copy full SHA for d01deb3

• Remove --no-hardware-acceleration flag

  BenCheung0422

  committed
  2ba62f8

  Copy full SHA for 2ba62f8

Commits on May 7, 2024

• Fix a miss of copy of texture of stone hoe

  BenCheung0422

  committed
  19d6297

  Copy full SHA for 19d6297

Commits on May 9, 2024

• Fix a miss of copy of texture of stone hoe (#678)

  Litorom

  authored
  68639fa

  Copy full SHA for 68639fa

Commits on May 10, 2024

• Fix a typo in ChangeLog.md

  BenCheung0422

  authored
  20b8c9b

  Copy full SHA for 20b8c9b

Commits on May 21, 2024

• Fix a typo in ChangeLog.md (#680)

  Litorom

  authored
  bae11d6

  Copy full SHA for bae11d6

• Merge branch 'main' into patch-73

  Litorom

  authored
  806ab42

  Copy full SHA for 806ab42

• Merge branch 'main' into color

  Litorom

  authored
  34ee623

  Copy full SHA for 34ee623

• Fix grammar

  Litorom

  authored
  3fe6fb5

  Copy full SHA for 3fe6fb5

• Merge branch 'main' into opengl

  Litorom

  authored
  8bee4a0

  Copy full SHA for 8bee4a0

Commits on May 24, 2024

• Update texture of colored beds

  BenCheung0422

  committed
  f720e23

  Copy full SHA for f720e23

• Update DecorTile.java to allow for more decors

  Show description for 39c87c4
  Litorom

  committed
  39c87c4

  Copy full SHA for 39c87c4

• Merge branch 'main' into opengl

  Litorom

  authored
  d6db168

  Copy full SHA for d6db168

• Make OpenGL HWA flag as in-app option (#677)

  Litorom

  authored
  3a4156f

  Copy full SHA for 3a4156f

• Merge branch 'main' into color

  Litorom

  authored
  f23afea

  Copy full SHA for f23afea

• Merge branch 'main' into patch-73

  Litorom

  authored
  5c6399f

  Copy full SHA for 5c6399f

• Minimally optimize light rendering (#675)

  Litorom

  authored
  5ac8397

  Copy full SHA for 5ac8397

• Merge branch 'main' into patch-74

  Litorom

  authored
  9b9b343

  Copy full SHA for 9b9b343

• Turn most multiplications and divisions of 16 to bit shifts (#674)

  Litorom

  authored
  1537fa2

  Copy full SHA for 1537fa2

• Update ChangeLog.md

  Litorom

  authored
  28a5391

  Copy full SHA for 28a5391

• Merge branch 'main' into patch-44

  Litorom

  authored
  6a2d552

  Copy full SHA for 6a2d552

• Standardize tile explosion functions by TNT and creeper (#559)

  Litorom

  authored
  6787c2b

  Copy full SHA for 6787c2b

Commits on May 25, 2024

• Fix tile IDs for wool tiles

  BenCheung0422

  committed
  e847c0f

  Copy full SHA for e847c0f

Commits on May 31, 2024

• Merge branch 'main' into patch-72

  Litorom

  authored
  2d3693c

  Copy full SHA for 2d3693c

• Fix Menu changing keys not bound to cursor mappings (#665)

  Litorom

  authored
  53e8dcb

  Copy full SHA for 53e8dcb

Commits on Jun 18, 2024

• Add inventory capacity counter

  BenCheung0422

  committed
  596dd77

  Copy full SHA for 596dd77

Commits on Jun 20, 2024

• Push localizations from Lokalise

  BenCheung0422

  committed
  284bd9b

  Copy full SHA for 284bd9b

• Update inventory counter design

  BenCheung0422

  committed
  0992b43

  Copy full SHA for 0992b43

• Fix positioning and sizing of inventory counter

  BenCheung0422

  committed
  99d758a

  Copy full SHA for 99d758a

• Change parseDouble to regex in Localization

  BenCheung0422

  committed
  be0d4e2

  Copy full SHA for be0d4e2

• Update Font#textWidth counting way

  BenCheung0422

  committed
  514fe85

  Copy full SHA for 514fe85

• Add inventory capacity counter (#686)

  Litorom

  authored
  1fcc0f1

  Copy full SHA for 1fcc0f1

• Merge branch 'main' into patch-66

  Litorom

  authored
  b3f1a01

  Copy full SHA for b3f1a01

Commits on Jun 25, 2024

• Merge branch 'main' into lokalise

  Litorom

  authored
  405e922

  Copy full SHA for 405e922

• Push localizations from Lokalise (#687)

  Litorom

  authored
  18eb277

  Copy full SHA for 18eb277

• Merge branch 'main' into color

  Litorom

  authored
  6e6f668

  Copy full SHA for 6e6f668

• Update FlowerTile.java

  Show description for 4b32616
  BenCheung0422

  committed
  4b32616

  Copy full SHA for 4b32616

Commits on Jun 27, 2024

• Merge branch 'main' into patch-66

  Litorom

  authored
  8ce5855

  Copy full SHA for 8ce5855

Commits on Jul 16, 2024

• Simplify Inventory#add and make more use of Player#tryAddToInvOrDrop (#630)

  Litorom

  authored
  c21d581

  Copy full SHA for c21d581

Commits on Jul 23, 2024

• Update overlay opac d from 128 to 160

  BenCheung0422

  committed
  ea68959

  Copy full SHA for ea68959

Commits on Aug 3, 2024

• Merge branch 'main' into devbackup

  BenCheung0422

  authored
  ff0bbb8

  Copy full SHA for ff0bbb8

Commits on Aug 14, 2024

• Merge branch 'main' into patch-78

  Litorom

  authored
  4767fea

  Copy full SHA for 4767fea

• Update loading version check for color system

  BenCheung0422

  committed
  3181d26

  Copy full SHA for 3181d26

Commits on Aug 28, 2024

• Merge branch 'main' into color

  Litorom

  authored
  245b80e

  Copy full SHA for 245b80e

Commits on Aug 29, 2024

• Create SECURITY.md

  BenCheung0422

  committed
  828504b

  Copy full SHA for 828504b

• Create CODE_OF_CONDUCT.md

  BenCheung0422

  committed
  b05bc20

  Copy full SHA for b05bc20

• Complement GitHub Community Standards (#698)

  Litorom

  authored
  76e9383

  Copy full SHA for 76e9383

• Merge branch 'main' into color

  Litorom

  authored
  44f56b8

  Copy full SHA for 44f56b8

• Resolve flower issues

  Show description for f63e188
  BenCheung0422

  committed
  f63e188

  Copy full SHA for f63e188

• Fix versioning

  Litorom

  committed
  ff74172

  Copy full SHA for ff74172

• Fixed odd regex

  Litorom

  committed
  7e74653

  Copy full SHA for 7e74653

• Fix previously fixed regex

  BenCheung0422

  committed
  d14fd76

  Copy full SHA for d14fd76

• Fix clothing recipes about dyes

  Show description for bc8b9b5
  BenCheung0422

  committed
  bc8b9b5

  Copy full SHA for bc8b9b5

• Added Dye Vat (WIP)

  Litorom

  committed
  e752166

  Copy full SHA for e752166

• Fix name casing of coloring items and entities

  BenCheung0422

  committed
  b3462d7

  Copy full SHA for b3462d7

• Added textures for the dye vat

  Litorom

  committed
  d464775

  Copy full SHA for d464775

• Update recipe advancement auto resolver

  BenCheung0422

  committed
  be033e6

  Copy full SHA for be033e6

• Merge branch 'color' of https://github.com/BenCheung0422/minicraft-plus-revived into color

  BenCheung0422

  committed
  f5bab41

  Copy full SHA for f5bab41

• Merge branch 'main' into patch-78

  Litorom

  authored
  7a451b6

  Copy full SHA for 7a451b6

• Correct light overlay overworld opacity level (#691)

  Litorom

  authored
  99cef75

  Copy full SHA for 99cef75

• Merge branch 'main' into color

  Litorom

  authored
  be4bd89

  Copy full SHA for be4bd89

• Merge branch 'main' into devbackup

  Litorom

  authored
  93bb426

  Copy full SHA for 93bb426

• Increment Version

  Litorom

  committed
  b8e2211

  Copy full SHA for b8e2211

• File backups in development builds (#610)

  Litorom

  authored
  4208bf1

  Copy full SHA for 4208bf1

• Merge branch 'main' into color

  Litorom

  authored
  d8369d5

  Copy full SHA for d8369d5

• Added recipe for Dye Vat

  Litorom

  committed
  6933f1c

  Copy full SHA for 6933f1c

• Merge branch 'color' of https://github.com/BenCheung0422/minicraft-plus-revived into pr/445

  Litorom

  committed
  321b842

  Copy full SHA for 321b842

• Decreased stone cost

  Litorom

  committed
  ae6ee34

  Copy full SHA for ae6ee34

• Cost for the iron has changed to actual iron ingots.

  Litorom

  committed
  663162e

  Copy full SHA for 663162e

• Reformat recipes.json

  BenCheung0422

  committed
  48e1f8f

  Copy full SHA for 48e1f8f

• Fix version check for loading wool tile

  BenCheung0422

  committed
  32b384f

  Copy full SHA for 32b384f

• Removed remains of scrapped feature

  Litorom

  committed
  4efa734

  Copy full SHA for 4efa734

• Merge branch 'main' into color

  Litorom

  authored
  8c0a77f

  Copy full SHA for 8c0a77f

• Update color system and sheep coloring (#445)

  Litorom

  authored
  5102159

  Copy full SHA for 5102159

• Added missing recipe for Ornate Wood

  Litorom

  committed
  4e75a1a

  Copy full SHA for 4e75a1a

• Convert to RED instead of WHITE due to texture

  Litorom

  committed
  9e2e579

  Copy full SHA for 9e2e579

Commits on Aug 30, 2024

• Merge branch 'main' into patch-77

  Litorom

  authored
  4cb0169

  Copy full SHA for 4cb0169

Commits on Sep 27, 2024

• Remove hardcoded restriction to corner rendering

  Show description for 815b98f
  BenCheung0422

  committed
  815b98f

  Copy full SHA for 815b98f

• Remove redundant hardcoded code to tile corner rendering (#701)

  Litorom

  authored
  10d832c

  Copy full SHA for 10d832c

• Merge branch 'main' into patch-77

  Litorom

  authored
  3c35403

  Copy full SHA for 3c35403

• Update some code handling strings where performance issues occur (#688)

  Litorom

  authored
  b197319

  Copy full SHA for b197319

Commits on Oct 14, 2024

• Fix issues regarding entity moving

  BenCheung0422

  committed
  d5ccab5

  Copy full SHA for d5ccab5

• Remove "if zero" in moveX and moveY

  BenCheung0422

  committed
  e9f7998

  Copy full SHA for e9f7998

Commits on Oct 25, 2024

• Fix a typo of "France" in languages

  BenCheung0422

  committed
  49a04d5

  Copy full SHA for 49a04d5

Commits on Oct 31, 2024

• Fix issues regarding entity movement methods (#702)

  Litorom

  authored
  1bc74aa

  Copy full SHA for 1bc74aa

• Fix a typo of "France" in languages (#706)

  Litorom

  authored
  478c266

  Copy full SHA for 478c266