Code

Rascal#146

Code

Closed

Faboslav wants to merge 179 commits into1.19.2Faboslav/friends-and-foes:1.19.2from rascalFaboslav/friends-and-foes:rascalCopy head branch name to clipboard

+3,569-768

Commits

Commits on Nov 20, 2022

• ¯\_(ツ)_/¯

  Faboslav

  committed
  a07f622

Commits on Nov 22, 2022

• Working 1.19.3

  Faboslav

  committed
  3ea9f52

Commits on Nov 23, 2022

• Updated POIS

  Faboslav

  committed
  7fc95f4

• Fixed ice chunk renderer

  Faboslav

  committed
  252bc7f

Commits on Nov 24, 2022

• Fixed structure pools

  Faboslav

  committed
  3614fff

Commits on Nov 25, 2022

• Updated version

  Faboslav

  committed
  e3928ee

Commits on Nov 28, 2022

• Merge branch 'master' into 1.19.3

  Show description for 768da98
  Faboslav

  committed
  768da98

• Bumped versions

  Faboslav

  committed
  6a786a8

• Reformat

  Faboslav

  committed
  1a41521

Commits on Dec 3, 2022

• Merge branch 'master' into 1.19.3

  Show description for 5b7cfbe
  Faboslav

  committed
  5b7cfbe

Commits on Dec 4, 2022

• Merge branch 'master' into 1.19.3

  Faboslav

  committed
  8233289

• Updated to pre-release

  Faboslav

  committed
  03cae5e

Commits on Dec 5, 2022

• Fixed access widener

  Faboslav

  committed
  57b4e6a

Commits on Dec 8, 2022

• Bumped versions

  Faboslav

  committed
  63a2ea7

• Working game

  Faboslav

  committed
  294fac7

• Still working

  Faboslav

  committed
  3be82a4

• Still working

  Faboslav

  committed
  2932a9a

• Updated mixins

  Faboslav

  committed
  26842ba

• Working game

  Faboslav

  committed
  353b974

• Fixed crash

  Faboslav

  committed
  b8231e7

• Working fabric and quilt

  Faboslav

  committed
  d0233ab

Commits on Dec 10, 2022

• Fixed spawn eggs

  Faboslav

  committed
  fa3f47e

Commits on Dec 12, 2022

• Bumped forge version

  Faboslav

  committed
  9563996

Commits on Dec 14, 2022

• Finished port

  Faboslav

  committed
  063c0fc

• Corrected changelog

  Faboslav

  committed
  dff0d87

• Removed todo

  Faboslav

  committed
  2dd3e75

• Merge pull request #77 from Faboslav/1.19.3

  Show description for 8be8d0e
  Faboslav

  authored
  8be8d0e

• Updated workflow

  Faboslav

  committed
  91f59c3

• Added back mod for development

  Faboslav

  committed
  46ce231

• Bumped quilt version

  Faboslav

  committed
  4836fa9

Commits on Dec 20, 2022

• Merge branch '1.19.2'

  Show description for dd13ebb
  Faboslav

  committed
  dd13ebb

• Fixed mixin

  Faboslav

  committed
  c4d2d37

Commits on Dec 22, 2022

• Merge branch '1.19.2'

  Show description for c24232f
  Faboslav

  committed
  c24232f

Commits on Dec 23, 2022

• Merge branch '1.19.2'

  Faboslav

  committed
  4c89e7e

• Fixed random range

  Faboslav

  committed
  c821e83

• Merge branch '1.19.2'

  Faboslav

  committed
  cafbd14

• Fixed changelog, format

  Faboslav

  committed
  5dd94a5

Commits on Dec 27, 2022

• Ported over changes, bumped version

  Faboslav

  committed
  241de2a

Commits on Jan 3, 2023

• Added lang entry for Potted Buttercup

  kingkuys2123

  authored
  29f22c4

• Merge pull request #86 from kingkuys2123/patch-1

  Show description for e5e3712
  Faboslav

  authored
  e5e3712

• Added flower_pots block tag

  kingkuys2123

  authored
  1fdb7d0

Commits on Jan 14, 2023

• Merge pull request #87 from kingkuys2123/master

  Show description for 9313576
  Faboslav

  authored
  9313576

• Merge branch '1.19.2'

  Show description for 839ca4d
  Faboslav

  committed
  839ca4d

• wtf

  Faboslav

  committed
  53cfb8c

• wtf #2

  Faboslav

  committed
  476feaa

• Bumped mod version

  Faboslav

  committed
  fffd98a

Commits on Jan 22, 2023

• Merge branch '1.19.2'

  Show description for aa91d01
  Faboslav

  committed
  aa91d01

• Merge branch '1.19.2'

  Show description for 53165d2
  Faboslav

  committed
  53165d2

• Corrected versions

  Faboslav

  committed
  4fa5469

• Fixed gradle.properties

  Faboslav

  committed
  d2dea63

Commits on Jan 25, 2023

• Update zh_cn.json

  swwind

  authored
  db31849

Commits on Feb 18, 2023

• Add Ukrainian localization (uk_ua.json)

  Nezila

  authored
  7bb2b95

Commits on Feb 21, 2023

• buttercup worldgen spawning

  TelepathicGrunt

  committed
  0c7271c

Commits on Mar 2, 2023

• Merge pull request #90 from swwind/master

  Show description for f87919e
  Faboslav

  authored
  f87919e

• Merge pull request #93 from Nezila/Nezila-patch-1

  Show description for fe034bd
  Faboslav

  authored
  fe034bd

• Merge pull request #94 from TelepathicGrunt/master

  Show description for 5c54f3f
  Faboslav

  authored
  5c54f3f

Commits on Mar 5, 2023

• Merge branch 'feature/1.19.2-tuff-golem' into feature/1.19.3-tuff-golem

  Show description for 922d398
  Faboslav

  committed
  922d398

Commits on Mar 6, 2023

• Almost done

  Faboslav

  committed
  fc8a33c

• Working build

  Faboslav

  committed
  aadcc57

• Fixed biome modifications

  Faboslav

  committed
  e849408

Commits on Mar 8, 2023

• Merge branch 'feature/1.19.2-tuff-golem' into feature/1.19.3-tuff-golem

  Faboslav

  committed
  b69c4eb

• Merge branch '1.19.2' into feature/1.19.3-tuff-golem

  Show description for 5532f7b
  Faboslav

  committed
  5532f7b

• Merge pull request #95 from Faboslav/feature/1.19.3-tuff-golem

  Show description for 8474243
  Faboslav

  authored
  8474243

Commits on Mar 9, 2023

• Merge branch '1.19.2'

  Show description for 53715ef
  Faboslav

  committed
  53715ef

• Merge branch '1.19.2'

  Faboslav

  committed
  bb76600

Commits on Mar 18, 2023

• First part of port to 1.19.4

  Faboslav

  committed
  a702ca1

Commits on Mar 19, 2023

• Second part of port to 1.19.4

  Faboslav

  committed
  c191645

• Finished port to 1.19.4

  Faboslav

  committed
  6219dce

Commits on Mar 20, 2023

• Corrected text

  Faboslav

  committed
  fe4c050

• Merge pull request #99 from Faboslav/feature/1.19.4

  Show description for 0be03bf
  Faboslav

  authored
  0be03bf

• Updated changelog

  Faboslav

  committed
  30f342e

• Fixed dependencies

  Faboslav

  committed
  966abb7

Commits on Apr 8, 2023

• Update it_it.json

  Zano1999

  authored
  c3ba140

Commits on Apr 10, 2023

• links

  Faboslav

  committed
  4b2858e

• Merge branch '1.19.2' into 1.19.3

  Show description for 6436358
  Faboslav

  committed
  6436358

• Merge branch '1.19.3'

  Show description for b0ba287
  Faboslav

  committed
  b0ba287

Commits on Apr 21, 2023

• Merge pull request #101 from Zano1999/patch-2

  Show description for e03ca99
  Faboslav

  authored
  e03ca99

Commits on May 13, 2023

• Merge branch '1.19.2' into 1.19.3

  Show description for 2e4870b
  Faboslav

  committed
  2e4870b

• Fixed errors

  Faboslav

  committed
  a3ad2e9

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  206a846

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  cae549d

• Merge branch '1.19.3'

  Show description for 93a1722
  Faboslav

  committed
  93a1722

Commits on May 16, 2023

• Merge branch '1.19.2' into 1.19.3

  Show description for ea3e90f
  Faboslav

  committed
  ea3e90f

• bumped versions

  Faboslav

  committed
  4592b85

• Merge branch '1.19.3'

  Show description for 85398d5
  Faboslav

  committed
  85398d5

• Bumped versions

  Faboslav

  committed
  736be25

• Fixed import

  Faboslav

  committed
  874d427

• Merge branch '1.19.3'

  Faboslav

  committed
  c2164d0

• Merge branch 'master' into feature/1.20

  Faboslav

  committed
  07d7648

Commits on May 17, 2023

• Working fabric

  Faboslav

  committed
  7967410

• Merge branch '1.19.2' into 1.19.3

  Show description for af0567c
  Faboslav

  committed
  af0567c

• Fixed readme

  Faboslav

  committed
  cdf090e

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  f28754d

• fixed changelog

  Faboslav

  committed
  e0a2106

Commits on Jun 7, 2023

• Reenabled modmenu & clothconfig

  Faboslav

  committed
  384b825

• reformat

  Faboslav

  committed
  7ba935d

• Added cherry beehive assets

  Faboslav

  committed
  72b5438

Commits on Jun 8, 2023

• Added cherry beehive

  Faboslav

  committed
  afea433

• Fixed tame glare criterion

  Faboslav

  committed
  787e63f

• Enabled forge

  Faboslav

  committed
  204f929

• Working forge

  Faboslav

  committed
  47182e8

• Added mooblooms to cherry grove

  Faboslav

  committed
  7cb01e7

• Infra

  Faboslav

  committed
  a43d15c

• Merge branch 'master' into feature/1.20

  Show description for bbad2fe
  Faboslav

  committed
  bbad2fe

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  6139284

• Merge branch '1.19.3'

  Faboslav

  committed
  bd417f9

• Merge branch 'master' into feature/1.20

  Faboslav

  committed
  9f88558

• Merge pull request #114 from Faboslav/feature/1.20

  Show description for ddb2269
  Faboslav

  authored
  ddb2269

Commits on Jun 11, 2023

• Working quilt

  Faboslav

  committed
  ac4165e

Commits on Jun 21, 2023

• Merge branch '1.19.2' into 1.19.3

  Show description for 0ebf34a
  Faboslav

  committed
  0ebf34a

• Merge branch '1.19.2' into 1.19.3

  Show description for e2d30b5
  Faboslav

  committed
  e2d30b5

• Merge branch '1.19.3' into 1.19.4

  Show description for 3890907
  Faboslav

  committed
  3890907

• Merge branch '1.19.4'

  Show description for b030437
  Faboslav

  committed
  b030437

• Fixed quilt publish workflow

  Faboslav

  committed
  0e5b5b8

• tmp rollback

  Faboslav

  committed
  f29d485

Commits on Jun 22, 2023

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  8cc5ab3

• Merge branch '1.19.3' into 1.19.4

  Faboslav

  committed
  bffb1b9

• fixed changelog

  Faboslav

  committed
  82776c1

• Merge branch '1.19.3' into 1.19.4

  Faboslav

  committed
  4990708

• fixed changelog

  Faboslav

  committed
  12d6b32

• Merge branch '1.19.4'

  Faboslav

  committed
  2d8c78c

Commits on Jun 27, 2023

• Updated Simplified Chinese translation

  WForst-Breeze

  authored
  6a27dbc

Commits on Jul 3, 2023

• Merge pull request #119 from WForst-Breeze/master

  Show description for e6dee45
  Faboslav

  authored
  e6dee45

• Fixed publish path

  Faboslav

  committed
  535f14b

• Merge branch '1.19.2' into 1.19.3

  Show description for c7647c6
  Faboslav

  committed
  c7647c6

• Merge branch '1.19.2' into 1.19.3

  Show description for cc03a4a
  Faboslav

  committed
  cc03a4a

• Corrected item order

  Faboslav

  committed
  e16bd05

• Merge branch '1.19.3' into 1.19.4

  Show description for 28c6e54
  Faboslav

  committed
  28c6e54

• Merge branch '1.19.4'

  Show description for 3c48b20
  Faboslav

  committed
  3c48b20

Commits on Jul 11, 2023

• Removed equipment interface implementation

  Faboslav

  committed
  24e98e7

Commits on Jul 12, 2023

• merge

  Faboslav

  committed
  947e2e5

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  5bf6a20

• Merge branch '1.19.3' into 1.19.4

  Show description for 94cc7fa
  Faboslav

  committed
  94cc7fa

• merge

  Faboslav

  committed
  69ff295

Commits on Jul 14, 2023

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  1440d64

• Merge branch '1.19.3' into 1.19.4

  Faboslav

  committed
  9efe73a

• Merge branch '1.19.4'

  Faboslav

  committed
  9e5a9a6

Commits on Jul 24, 2023

• updated grandle & loom

  Faboslav

  committed
  445f823

• wip workflow

  Faboslav

  committed
  cfb1969

Commits on Jul 25, 2023

• Update uk_ua.json

  unroman

  authored
  5fa7264

Commits on Aug 14, 2023

• Merge branch '1.19.2' into 1.19.3

  Show description for b90a505
  Faboslav

  committed
  b90a505

• Merge branch '1.19.2' into 1.19.3

  Show description for 0e6230e
  Faboslav

  committed
  0e6230e

• Merge branch '1.19.3' into 1.19.4

  Show description for b4b45af
  Faboslav

  committed
  b4b45af

• Merge branch '1.19.4'

  Show description for 1bdd867
  Faboslav

  committed
  1bdd867

Commits on Aug 17, 2023

• Fixed wax_off.json advancement

  Show description for 5f62bbe
  kingkuys2123

  authored
  5f62bbe

• Fixed wax_on.json advancement

  Show description for 4eb7fe4
  kingkuys2123

  authored
  4eb7fe4

Commits on Aug 18, 2023

• Added bamboo beehive

  Faboslav

  committed
  14eeb04

• reformat

  Faboslav

  committed
  cc99088

• Merge pull request #134 from kingkuys2123/master

  Show description for 0c9219f
  Faboslav

  authored
  0c9219f

• Merge pull request #132 from unroman/patch-1

  Show description for 259e707
  Faboslav

  authored
  259e707

• Merge branch '1.19.2' into 1.19.3

  Show description for c592891
  Faboslav

  committed
  c592891

• Merge branch '1.19.3' into 1.19.4

  Show description for 0d37be1
  Faboslav

  committed
  0d37be1

• Merge branch 'master' of github.com:Faboslav/friends-and-foes

  Show description for 3f7c7b3
  Faboslav

  committed
  3f7c7b3

Commits on Aug 19, 2023

• Merge branch '1.19.2' into 1.19.3

  Faboslav

  committed
  1a27420

• Merge branch '1.19.3' into 1.19.4

  Faboslav

  committed
  465bca5

• Merge branch '1.19.4'

  Show description for 03296e3
  Faboslav

  committed
  03296e3

Commits on Aug 26, 2023

• Working rascal entity

  Faboslav

  committed
  702a2d9

Commits on Sep 1, 2023

• Update ru_ru.json

  mpustovoi

  committed
  b0e7470

Commits on Sep 15, 2023

• wip rascal

  Faboslav

  committed
  c98a200

Commits on Sep 16, 2023

• Merge pull request #137 from mpustovoi/mp

  Show description for 3462c8a
  Faboslav

  authored
  3462c8a

• Merge branch '1.19.2' into 1.19.3

  Show description for d8103c5
  Faboslav

  committed
  d8103c5

• Merge branch '1.19.3' into 1.19.4

  Show description for 1f933e7
  Faboslav

  committed
  1f933e7

• Merge branch '1.19.4'

  Show description for 3129908
  Faboslav

  committed
  3129908

Commits on Sep 26, 2023

• Merge branch '1.19.2' into 1.19.3

  Show description for 8c90304
  Faboslav

  committed
  8c90304

• infra

  Faboslav

  committed
  c573e65

• Merge branch '1.19.3' into 1.19.4

  Show description for 98de6f4
  Faboslav

  committed
  98de6f4

• wip

  Faboslav

  committed
  9af9c74

Commits on Sep 27, 2023

• Merge branch 'master' into rascal

  Show description for 7ee5191
  Faboslav

  committed
  7ee5191

Commits on Sep 30, 2023

• Added rascal gameplay loop

  Faboslav

  committed
  38cabe0

• Added rascal hide and seek advancement

  Faboslav

  committed
  df82286

Commits on Oct 6, 2023

• wip animations

  Faboslav

  committed
  0e38b67

Commits on Oct 9, 2023

• Animations, loot table reward

  Faboslav

  committed
  4fe6a75

• Updated model

  Faboslav

  committed
  ef561af

Commits on Oct 10, 2023

• Corrected animations

  Faboslav

  committed
  fcb2eef

Commits on Oct 11, 2023

• Fixed subtitles, fixed rascal tasks, improved rascal loot tables

  Faboslav

  committed
  cae4bf8

• format

  Faboslav

  committed
  cfe6098

• Better sound design, updated range/cooldown values

  Faboslav

  committed
  f8627fa

Commits on Oct 12, 2023

• Rascal balancing

  Faboslav

  committed
  21c01ab

• Rollbacks #1

  Faboslav

  committed
  714604e