Commit Graph
620 Commits
Author SHA1 Message Date
gnembon 090eb61ece 1.17-pre2 2021-05-31 17:08:50 -03:00
gnembon c0caa798eb Merge branch 'master' into 1.17 2021-05-31 17:02:07 -03:00
gnembon 8d181823d4 1.4.39 2021-05-31 17:01:52 -03:00
gnembon 38b2e83d05 fixed crash report for 1.17 2021-05-31 16:14:10 -03:00
gnembon 3e02df9150 Merge branch 'master' into 1.17 2021-05-27 15:01:17 -03:00
gnembon f64cf67e41 1.17-pre1 2021-05-27 15:01:07 -03:00
gnembon 63901ebb0c 1.4.38 2021-05-27 14:30:36 -03:00
gnembon 69d1558e4d mappings 2021-05-22 22:19:28 -03:00
gnembon f56b22be6a 1.4.37 2021-05-19 18:19:06 -03:00
gnembon 47d629bac2 Merge branch 'master' into 1.17 2021-05-19 15:30:42 -03:00
gnembon 1942726e20 21w20a 2021-05-19 15:30:20 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 7ed96e22f1 Merge branch 'master' into 1.17 2021-05-12 17:07:13 -03:00
gnembon a593f1cf14 1.4.36 2021-05-12 17:05:28 -03:00
gnembon 7a8914a0cb mapping 2021-05-12 17:03:34 -03:00
gnembon dfa826bb24 21w18a 2021-05-05 20:34:59 -03:00
gnembon 7780a3276d Merge branch 'master' into 1.17 2021-05-05 20:20:48 -03:00
gnembon 7063d542ff 1.4.35 2021-05-05 20:19:18 -03:00
gnembon e4ebeda1d0 mapping 2021-05-05 01:44:05 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 624f9973c8 Merge branch 'master' into 1.17 2021-04-28 16:50:45 -03:00
gnembon f8c3de21d3 1.4.34 2021-04-28 16:48:46 -03:00
gnembon 99e8db192a mappings 2021-04-28 01:42:49 -03:00
gnembon fc87053978 21w16a 2021-04-21 20:12:44 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 8c9dabdbbc 1.4.33 2021-04-21 18:41:39 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03:00
gnembon 2612dff497 Merge branch 'master' into 1.17 2021-04-14 15:07:15 -03:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -03:00
gnembon 1a96737cff 1.4.32 2021-04-14 14:35:49 -03:00
gnembon cc3723ae12 mapping 2021-04-13 19:54:23 -03:00
gnembon 8903865faa Merge branch 'master' into 1.17 2021-04-07 19:12:08 -03:00
gnembon 6c9dbdda12 21w14a 2021-04-07 19:11:59 -03:00
gnembon 75a823f994 mapping 2021-04-07 19:05:45 -03:00
gnembon e0eec1bb9c 1.4.31 2021-04-07 18:49:53 -03:00
gnembon 2e3a49756b mapping 2021-04-06 21:05:34 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon b49b99aea6 21w11a mappings 2021-03-31 19:20:44 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-03-18 00:52:13 -03:00
gnembon 7d135187b1 fixed shapes for 1.17 rendringo 2021-03-18 00:37:05 -03:00
gnembon 3156094719 1.4.30 2021-03-17 19:00:11 -03:00
gnembon 0b93101248 mapping 2021-03-17 10:42:31 -03:00
gnembon 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00
gnembon a499c3cd68 Merge branch 'master' into 1.17 2021-03-10 23:16:36 -04:00
gnembon 4e168626dd 1.4.29 2021-03-10 23:15:03 -04:00
gnembon 42f78a596a 20w10a
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon 170fd9d762 mappings 2021-03-09 20:06:29 -04:00
gnembon 3f16c45a69 mappings 2021-03-02 09:08:16 -04:00