Commit Graph

568 Commits

Author SHA1 Message Date
Brianna fff482d873 Fix for setting material to air. 2019-10-06 12:30:15 -04:00
Brianna de504c3d12 Merging sickness. 2019-10-06 12:25:41 -04:00
Brianna e3b69bd6b2 Merge branch 'core' into development 2019-10-06 12:22:54 -04:00
Brianna bfcfde1331 Merge remote-tracking branch 'origin/development' 2019-10-06 12:19:23 -04:00
Brianna 3a592a1eef version 2.4 2019-10-06 12:19:06 -04:00
Brianna cf9770f5e8 Added compatibility with UltimateStacker 2019-10-06 12:17:51 -04:00
Brianna 04f412a94c Various fixes. 2019-10-06 12:17:33 -04:00
Brianna 77d3c8b192 More fixes. 2019-10-06 11:25:28 -04:00
jascotty2 f18c4ed9d7 prevent drag-drop into non-inventory 2019-10-06 09:53:29 -05:00
Brianna 4bcebfcea0 Minor improvements. 2019-10-06 10:37:05 -04:00
jascotty2 bb2cdea235 fix editor,config errors 2019-10-04 11:36:46 -05:00
jascotty2 c8ecab352b enable minimize 2019-10-03 13:38:39 -05:00
jascotty2 656207c64a first working core build - needs testing 2019-10-02 10:55:04 -05:00
Lilac 0a1fb48955 Version 2.3.26 2019-09-29 18:29:33 +01:00
Lilac 6f001fc597 Added lang lines, fixed items resetting 2019-09-29 18:29:02 +01:00
Brianna cc6b7a6c17 Merge remote-tracking branch 'origin/core' into core 2019-09-28 20:24:16 -04:00
Brianna 503adbd6f8 Even cleaner 2019-09-28 20:24:12 -04:00
jascotty2 1c45347d5f update commands 2019-09-28 19:09:53 -05:00
jascotty2 e372388ea9 minor cleanup 2019-09-28 19:08:05 -05:00
jascotty2 1550669886 Merge branch 'core' of gitlab.com:Songoda/ultimatekits into core 2019-09-28 19:01:55 -05:00
jascotty2 faafe5fdbd selector gui 2019-09-28 19:01:50 -05:00
Brianna 4f01c747e5 Lots of edible goat bits. 2019-09-28 19:45:32 -04:00
jascotty2 00d42a96cc minor work 2019-09-28 16:41:42 -05:00
jascotty2 b308e3626a merge 2019-09-28 16:07:00 -05:00
Brianna 9788b7f424 trash 2019-09-28 17:03:49 -04:00
jascotty2 429a8fde5c note 2019-09-28 16:03:20 -05:00
jascotty2 fa7b3594b4 fix location data bug 2019-09-25 07:20:32 -05:00
jascotty2 a302800945 Version 2.3.25 2019-09-25 07:09:27 -05:00
jascotty2 6365f72133 fix location data duplication bug 2019-09-25 07:08:46 -05:00
Brianna 58927a437b NPE Fix with item display. 2019-09-24 19:47:47 -04:00
jascotty2 fff00f77ae core conversion progress 2019-09-24 08:30:19 -05:00
jascotty2 aaa9ecf8d1 core conversion progress 2019-09-17 11:55:46 -05:00
jascotty2 5a162bd0e2 update pom 2019-09-16 10:08:00 -05:00
jascotty2 1f32f15159 add holograms to soft dependencies 2019-09-16 10:07:30 -05:00
jascotty2 8ce97e7702 cleanup 2019-09-16 09:17:50 -05:00
jascotty2 4be7e3c50b make recursive selection less recursive 2019-09-16 09:13:11 -05:00
jascotty2 98525b9367 Merge branch 'development' of gitlab.com:Songoda/ultimatekits into core 2019-09-16 09:07:40 -05:00
jascotty2 22bfc43ccf core conversion progress 2019-09-16 09:07:33 -05:00
Lilac e8e2b26f10 Fixed kits sometimes giving no items. 2019-09-14 19:39:47 +01:00
jascotty2 2213fa048b Start converting to core 2019-09-11 17:04:29 -05:00
Lilac 63e6b8e090 Version. 2019-09-07 21:44:41 +01:00
Lilac 156ad084c1 Fixed kit items resetting. 2019-09-07 21:43:06 +01:00
Jacob Scott 37672b9e3f Merge branch 'patch-1' into 'development'
Update en_US.lang | Remove duped key

See merge request Songoda/ultimatekits!42
2019-09-03 22:34:29 +00:00
Vrontis 274bbb54c7 Update en_US.lang | Remove duped key 2019-09-03 22:34:28 +00:00
Brianna a36411247b Merge remote-tracking branch 'origin/development' into development 2019-08-19 18:28:23 -04:00
Brianna 8645de8db0 Tab update 2019-08-19 18:28:20 -04:00
Lilac 3969268ce9 Version. 2019-08-14 23:01:02 +01:00
Brianna 630effb6f7 debug 2019-08-14 14:11:22 -04:00
Brianna bb0495bfa3 Fix for KitItem bug / clean up 2019-08-14 00:07:12 -04:00
Brianna 614a9eb21f TabManager Sucked 2019-08-14 00:06:40 -04:00