 gnembon
|
2e1cfdda5d
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-20 01:03:04 -04:00 |
|
|
gnembon
|
7ef2f9c8ca
|
new loader
|
2019-11-20 00:59:49 -04:00 |
|
|
gnembon
|
df9280e8c2
|
Merge branch 'master' into 1.15
|
2019-11-19 22:56:30 -04:00 |
|
|
gnembon
|
a9238b9918
|
docs
|
2019-11-19 22:53:26 -04:00 |
|
|
gnembon
|
909b183bda
|
Merge branch 'master' into 1.15
|
2019-11-19 01:32:15 -04:00 |
|
|
gnembon
|
9e529fe967
|
Separate ScriptHost from CarpetScriptHost
|
2019-11-19 01:31:56 -04:00 |
|
|
gnembon
|
729399870e
|
Merge branch 'master' into 1.15
|
2019-11-18 22:07:42 -04:00 |
|
|
gnembon
|
bd61340e46
|
events are added on the fly as source loads
|
2019-11-18 16:06:35 -04:00 |
|
|
gnembon
|
12408cac75
|
Merge branch 'master' into 1.15
|
2019-11-18 01:17:37 -04:00 |
|
|
gnembon
|
bf11cb7967
|
Merge pull request #103 from gnembon/proper_functions
Proper functions
|
2019-11-18 01:16:22 -04:00 |
|
|
gnembon
|
95b85928f9
|
refactored and reworked functions in scarpet
|
2019-11-18 00:56:50 -04:00 |
|
|
gnembon
|
bb95c39b41
|
bee version
|
2019-11-14 23:26:49 -04:00 |
|
|
gnembon
|
57d1546fb3
|
Merge branch 'master' into 1.15
|
2019-11-14 23:21:45 -04:00 |
|
|
gnembon
|
3feb7bffbb
|
midversion to support fixed profiler
|
2019-11-14 23:19:21 -04:00 |
|
|
gnembon
|
5e276c6115
|
tighten up profiler client support
|
2019-11-14 23:18:07 -04:00 |
|
|
gnembon
|
08a9e982e3
|
19w46a+build.2
|
2019-11-14 01:49:47 -04:00 |
|
|
gnembon
|
bd59fe1254
|
Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15
Conflicts:
gradle.properties
|
2019-11-14 01:42:01 -04:00 |
|
|
gnembon
|
308114b426
|
19w46a - no changes needed
|
2019-11-13 14:07:35 -04:00 |
|
|
gnembon
|
29fa86ca8a
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-13 14:03:52 -04:00 |
|
|
gnembon
|
12e6ef627f
|
1.2.3
|
2019-11-13 14:01:29 -04:00 |
|
|
gnembon
|
e89e140536
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-12 22:13:30 -04:00 |
|
|
gnembon
|
fd5e53ec42
|
169
|
2019-11-12 22:12:37 -04:00 |
|
|
gnembon
|
831fc06e0a
|
Merge branch 'master' into 1.15
|
2019-11-12 00:58:30 -04:00 |
|
|
gnembon
|
33812fc88a
|
despawn timer for living entities
|
2019-11-12 00:57:58 -04:00 |
|
|
gnembon
|
1861381951
|
oupsie
|
2019-11-10 20:49:31 -04:00 |
|
|
gnembon
|
0021aa4a20
|
19w45b
|
2019-11-09 23:51:53 -04:00 |
|
|
gnembon
|
d212fcb03d
|
Merge branch 'master' into 1.15
|
2019-11-09 23:19:00 -04:00 |
|
|
gnembon
|
f61976f039
|
ctrlQ crafting will not craft other items if items not match up.
|
2019-11-09 23:18:19 -04:00 |
|
|
gnembon
|
bcff4fbbc4
|
clarify laziness of blocks and added more care to context execution
|
2019-11-09 23:12:05 -04:00 |
|
|
gnembon
|
7bcdd0ab72
|
Merge branch 'master' of https://github.com/gnembon/fabric-carpet
|
2019-11-09 13:11:43 -04:00 |
|
|
gnembon
|
65a2ae263c
|
Merge pull request #101 from DeadlyMC/patch
Fix ctrlQCrafting and autoCrafting duplicating items
|
2019-11-09 12:48:24 -04:00 |
|
|
DeadlyMC
|
16f232e30d
|
Port the ctrlQCrafting change from carpet112 by @X-com
|
2019-11-09 21:55:54 +05:30 |
|
|
gnembon
|
829e0a7df5
|
Merge branch 'master' into 1.15
|
2019-11-08 22:47:29 -04:00 |
|
|
gnembon
|
6aa358c5fc
|
calling block for a block future will resolve it.
|
2019-11-08 22:47:18 -04:00 |
|
|
gnembon
|
4cc0412fe2
|
Merge branch 'master' into 1.15
|
2019-11-08 04:07:28 -04:00 |
|
|
gnembon
|
f30459bd22
|
fixed docs
|
2019-11-08 04:03:39 -04:00 |
|
|
gnembon
|
223c5059be
|
v191108
|
2019-11-08 02:50:03 -04:00 |
|
|
gnembon
|
336b1070a3
|
disable kelpGenerationGrowthlimit because its fixes the same way in core
|
2019-11-08 02:46:51 -04:00 |
|
|
gnembon
|
ec19e37a74
|
19w45a
|
2019-11-07 16:13:15 -04:00 |
|
|
gnembon
|
6dd31329b7
|
Merge branch 'master' into 1.15
|
2019-11-07 14:29:26 -04:00 |
|
|
gnembon
|
c855955179
|
1.2.2
|
2019-11-07 14:27:25 -04:00 |
|
|
gnembon
|
4f0389fa7e
|
115
|
2019-11-07 07:59:28 -04:00 |
|
|
gnembon
|
718fb38d7d
|
Merge branch 'master' into 1.15
|
2019-11-07 07:59:05 -04:00 |
|
|
gnembon
|
24d4159f9f
|
Merge branch 'dummy_enchants' into 1.15
|
2019-11-07 07:58:32 -04:00 |
|
|
gnembon
|
4997fa5a44
|
added optional force bool
|
2019-11-07 07:58:17 -04:00 |
|
|
gnembon
|
947e53d770
|
Merge branch 'master' into 1.15
|
2019-11-07 01:11:51 -04:00 |
|
|
gnembon
|
ba2d654cec
|
added generation status
|
2019-11-07 01:11:04 -04:00 |
|
|
gnembon
|
ecf3f24c28
|
function definition now borrows variables from the defined context, not used context - so much more useful.
|
2019-11-04 01:16:24 -04:00 |
|
|
gnembon
|
efb87c8497
|
added copy and fixed cleaning of semicolons
|
2019-11-04 00:35:32 -04:00 |
|
|
gnembon
|
ff8dc630c5
|
19w44a
|
2019-10-30 13:38:51 -03:00 |
|