Commit Graph
154 Commits
Author SHA1 Message Date
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon dc38cd272f Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-13 11:47:56 -03:00
altrisi 1a92531554 Compact fabric initialization code (#918) 2021-06-12 23:02:33 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 0dd88cd1dc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon a1e0cfbc69 naming 2021-04-14 22:49:06 -03:00
b7252a3465 Fixing small issues (#717)
* adding unix_time and convert_dat eto editor autocomplete

I never used it, and only realised rn when I needed it.

* updating npp docs too

* Fixes #690

Fixes #690

* Fixes #687

Fixes #687

* fixes #672

* adding comma to make it look gooder

* Update src/main/java/carpet/helpers/HopperCounter.java

* using alias to shorten code

* compacting wool code

* Fixing minor todos

* removing hit/hand garbage

* removing scoreboards garbage

* making sure I dont edit file accidentally

* fixing borken code and problem with pink and magenta showing same colour

* Change name of mod to, you know, actually be the name of the mod

* Reverting previous change because it is more descriptive of the actual mod

* Update src/main/java/carpet/script/api/WorldAccess.java

Co-authored-by: Ghoulboy78 <ghoulboy78@gmail.com>
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-14 22:47:14 -03:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
altrisi 96244dc4e2 Update Gradle and reintroduce automatic JSON version 2020-12-30 14:20:19 +01:00
gnembon c2436f1f09 Merge branch 'master' into 1.17 2020-12-16 18:04:52 -04:00
gnembon c6529c3d3c 1.4.21 2020-12-16 18:03:04 -04:00
gnembon 1c39914f4f Merge branch 'master' into 1.17 2020-12-02 18:21:25 -04:00
gnembon 632d7c3268 1.4.20 2020-12-02 18:15:26 -04:00
gnembon 8a95db6400 Merge branch 'master' into 1.17 2020-11-25 19:09:57 -04:00
gnembon dd9d6659fb 1.4.19 2020-11-25 19:08:33 -04:00
gnembon 2d7ce5dccd Merge branch 'master' into 1.17 2020-11-21 07:02:20 -04:00
gnembon 8e3c330e04 1.4.18 2020-11-21 06:46:20 -04:00
gnembon 769e38021c Merge branch 'master' into 1.17 2020-11-11 16:08:30 -04:00
gnembon c7a96aa219 1.4.17 verbump 2020-11-11 16:07:02 -04:00
gnembon f306da7cc2 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java
2020-11-06 00:25:36 -04:00
gnembon 116b2caa41 1.4.16 2020-11-06 00:24:24 -04:00
gnembon 2cdea92da7 20w45a 2020-11-06 00:06:53 -04:00
gnembon 5c76723091 1.16.4 with 1.4.15 2020-11-02 15:43:21 -04:00
gnembon 1ea73ddf56 1.4.14 2020-10-22 20:10:52 -03:00
altrisi 020866c0e9 Change load method to Loader's entrypoints (#497)
* Start moving away from noop mixins

Remove the mixin from the json list

* Change startup method to Loader entrypoints
2020-10-15 22:15:20 -03:00
gnembon 05a0628530 1.4.13 with 1.16.4-pre1 2020-10-15 20:27:02 -03:00
gnembon 8a2ddcbf2a 1.4.12 2020-10-01 14:14:01 -03:00
gnembon 4c88421587 1.16.3 as 1.4.11 2020-09-10 15:12:37 -03:00
gnembon c79610db01 1.4.10, mc 1.16.3-pre1 2020-09-07 16:20:47 -03:00
gnembon e2c8b9cc41 1.4.9 2020-08-15 02:35:25 -03:00
gnembon af40223c17 Merge branch 'master' into 1.16 2020-08-11 18:12:07 -03:00
gnembon a1a7b0ab33 1.4.8 2020-08-11 16:52:47 -03:00
gnembon deea3b7ec4 Merge branch 'master' into 1.16 2020-08-06 21:56:58 -03:00
gnembon 13f0b2399e 1.4.7 2020-08-06 21:48:22 -03:00
gnembon d85b0737ff Merge branch 'master' into 1.16 2020-08-05 19:54:31 -03:00
gnembon 24bb0e5a59 1.4.6 2020-08-05 14:58:40 -03:00
gnembon 0a0503fb08 1.4.5 2020-07-29 17:34:50 -03:00
gnembon 18e8f1020b Merge branch 'master' into 1.16 2020-07-29 17:28:22 -03:00
gnembon 42a43ff245 Merge branch 'master' into 1.16 2020-07-22 17:15:29 -03:00
gnembon 3f593943c9 1.4.4 2020-07-22 16:58:09 -03:00
gnembon 8a07c96d45 Merge branch 'master' into 1.16 2020-07-15 16:40:35 -03:00
gnembon c728fcb8cc 1.4.3 2020-07-15 15:36:09 -03:00
gnembon 0e21942df7 Merge branch 'master' into 1.16 2020-07-13 00:41:34 -03:00
gnembon e2f48d6d16 1.4.2 2020-07-13 00:40:33 -03:00
gnembon c69f65e68e Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-07-01 14:54:04 -03:00
gnembon 41258e8494 1.4.1 2020-07-01 14:51:00 -03:00
gnembon 66a02c06cd Merge branch 'master' into 1.16 2020-06-28 14:34:35 -03:00
gnembon d3f1f77500 licence is MIT 2020-06-28 13:20:42 -03:00
gnembon a9c6e46c59 Merge branch 'master' into 1.16 2020-06-23 11:27:00 -03:00
gnembon 89bd9a0a55 1.4.0 2020-06-23 09:40:09 -03:00