Commit Graph
806 Commits
Author SHA1 Message Date
gnembon 8a09fb55b2 Merge branch 'master' into 1.16 2020-02-09 01:57:58 -04:00
gnembon 161b5d491d added options for drop command 2020-02-09 01:56:30 -04:00
gnembon 8ed56c1d81 raneming 2020-02-08 18:27:34 -04:00
gnembon dffaec7355 raneming 2020-02-08 18:21:18 -04:00
gnembon e63dd15433 raneming 2020-02-08 18:17:55 -04:00
gnembon 13a8fbb6f2 Merge pull request #142 from ImUrX/betterNetherDelays
make the nether portal delays better, fixes #139
2020-02-08 18:12:57 -04:00
ImUrX a44b4439bc in both sides... 2020-02-08 16:51:56 -03:00
ImUrX d13ae34b1e forgot about invulnerable 2020-02-08 16:50:55 -03:00
ImUrX a83088e685 use injections 2020-02-08 16:49:39 -03:00
gnembon 2f517f93eb Merge branch 'master' into 1.16 2020-02-08 15:20:35 -04:00
gnembon 5624d8e965 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-02-08 15:20:06 -04:00
gnembon 148a3a0676 resurrecting elders, fixes #141 2020-02-08 15:19:27 -04:00
ImUrX fe56ab8d3e overwrite getMaxNetherPortalTime 2020-02-08 16:18:56 -03:00
gnembon 9a875c64e2 added player type 2020-02-07 11:14:25 -04:00
gnembon c9438aefa4 20w06a-6 2020-02-06 21:30:14 -04:00
gnembon 3dccaef921 Merge branch 'master' into 1.16 2020-02-06 21:00:29 -04:00
gnembon c3137203b2 reworked destroy 2020-02-06 21:00:02 -04:00
gnembon 67d71e26c1 destroy rework, needs testing 2020-02-06 16:54:36 -04:00
gnembon 32ee85b52c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-02-06 09:50:30 -04:00
gnembon 73680247f4 b 2020-02-06 09:35:08 -04:00
gnembon 85a34fdefa added profile command 2020-02-06 09:33:46 -04:00
gnembon 4780514cb2 20w06a -3 mapping 2020-02-05 20:41:15 -04:00
gnembon 7f09bbf193 a note 2020-02-06 00:13:52 -04:00
gnembon 536b88e61f Merge branch 'master' into 1.16 2020-02-05 20:15:35 -04:00
gnembon dc42ea77b1 Merge branch 'master' into 1.16 2020-02-05 19:55:57 -04:00
gnembon e6a49467c4 1.3.9, why not 2020-02-05 19:55:43 -04:00
gnembon ba0ee10594 20w06a features 2020-02-05 19:54:31 -04:00
gnembon b9bd5ec17d 20w06a features 2020-02-05 18:24:01 -04:00
gnembon 9fa0e6109b 20w06a 2020-02-05 13:56:51 -04:00
gnembon ae56f3e2ba 1.3.8 2020-02-05 13:28:44 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon e04a8be9e8 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-02-03 10:58:17 -04:00
gnembon eb7547072c wrapping back destroy - will finish later 2020-02-03 10:54:41 -04:00
gnembon 230cee7815 fix materials 2020-02-02 20:16:44 -04:00
gnembon b4a50b8c3f mulitple counters in hud - not really needed but why not. 2020-02-02 00:03:38 -04:00
gnembon 54f81f184a updating destroy WIP 2020-01-30 17:36:46 -04:00
gnembon ef16ade921 forgot fortress 2020-01-30 02:22:54 -04:00
gnembon c5afe202f7 mappin updates 2020-01-28 12:26:53 -04:00
gnembon 00a540505e Merge branch 'master' into 1.15 2020-01-28 12:23:11 -04:00
gnembon 4bf27c3d15 interactionUpdates 2020-01-28 12:22:51 -04:00
gnembon 0acb1077a2 spawn optimizations 2020-01-28 08:45:11 -04:00
gnembon bd637d5d6b mapping 2020-01-27 23:30:31 -04:00
gnembon 26a038041e Merge branch 'master' into 1.15 2020-01-27 23:14:15 -04:00
gnembon 021befbd3c 1.3.7 2020-01-27 23:14:01 -04:00
gnembon a50b00059e Merge branch 'master' into 1.15 2020-01-27 22:48:56 -04:00
gnembon 9430fcc052 handled better errors and stack traces for more (all) cases 2020-01-27 22:47:29 -04:00
gnembon e94dd23402 Merge branch 'master' into 1.15 2020-01-27 14:50:11 -04:00
gnembon 6c1d3dd5f6 fix defaults on hardcodeTNTangle 2020-01-27 14:48:56 -04:00
gnembon e7d9c62b11 slime chunks to renderers 2020-01-25 22:08:25 -04:00
gnembon bff219a38f Merge branch 'master' into 1.15 2020-01-25 20:10:24 -04:00