TicTicBoooom-Mods/MasterfulMachinery
1
0
Fork 0
mirror of https://github.com/TicTicBoooom-Mods/MasterfulMachinery.git synced 2026-01-18 16:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
75 Commits 4 Branches 1 Tag
3f7593dd179bfebaee1cbd4bbca19fc712dc2efc
Commit Graph

75 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ticticboooom
3f7593dd17 fixed and tested mekanism chemical ports 2021-07-04 20:32:57 +01:00
ticticboooom
110c544a47 fixed bugs and added new compat port io textures 2021-06-02 14:39:12 +01:00
ticticboooom
aa0c3a963d added loot tables, io textures for compat ports, consume instantly flag 2021-05-29 16:08:40 +01:00
ticticboooom
d28de7f319 added output astral port 2021-05-26 12:20:33 +01:00
ticticboooom
22c70701a2 fixed create port and added infuse types to mek support 2021-05-25 08:38:37 +01:00
ticticboooom
17b448b449 re-implementing create ports to incorporate stress units and more robust rotation 2021-05-25 00:49:25 +01:00
ticticboooom
31224783c2 Merge remote-tracking branch 'origin/master' 2021-05-24 20:38:51 +01:00
ticticboooom
3947ee4bf9 finished implementing mana port and fixed some jei issues with mana 2021-05-24 20:38:39 +01:00
MasterSloth1
409a6a19d2 Update issue templates 2021-05-25 07:20:57 +12:00
ticticboooom
17a3ca77ee version increment 2021-05-24 17:53:55 +01:00
ticticboooom
52e3c058fd fixed some bugs and started nbt support 2021-05-24 17:46:13 +01:00
TicTicBoooom
6726388031 added gradle build on master 2021-05-24 17:06:08 +01:00
TicTicBoooom
d31f0c361e Merge pull request #7 from OneLemonyBoi/manastuff 
Manastuff
 2021-05-23 23:05:36 +01:00
ticticboooom
c0202432cf catching some errors to remove call stacks 2021-05-23 23:05:18 +01:00
OneLemonyBoi
913eaf87fe Merge branch 'master' into manastuff 2021-05-23 14:59:08 -07:00
OneLemonyBoi
9e4eac89ef jank io 2021-05-23 14:57:10 -07:00
OneLemonyBoi
21ba20716f io stuff, anyways, bye 2021-05-23 14:19:24 -07:00
OneLemonyBoi
b1092788c4 manaaaaaaaaaaaaaaaaa 2021-05-23 13:59:08 -07:00
OneLemonyBoi
d52ddfcb8b lil push 2021-05-21 22:28:00 -07:00
ticticboooom
352a3fda18 merge with my hotfix work 2021-05-21 23:54:20 +01:00
ticticboooom
c8a6c53dca Merge branch 'master' of github.com:TicTicBoooom-Mods/MasterfulMachinery 
 Conflicts:
	src/main/java/com/ticticboooom/mods/mm/block/MachinePortBlock.java
	src/main/java/com/ticticboooom/mods/mm/ports/storage/AstralStarlightPortStorage.java
 2021-05-21 23:35:22 +01:00
TicTicBoooom
a7cb9d8fb0 Merge pull request #5 from OneLemonyBoi/master 
Astral Sorcery Ports Merge
 2021-05-21 23:28:03 +01:00
ticticboooom
548a27a53d fixed bugs with jei zoom and added blockstate properties to structures 2021-05-21 19:05:59 +01:00
OneLemonyBoi
47f003e129 pushes 2021-05-20 21:58:57 -07:00
OneLemonyBoi
0cc4a287e7 astral ports primitive 2021-05-20 18:31:39 -07:00
ticticboooom
ee685fbe98 added structure config generator block with functionality 2021-05-20 22:50:48 +01:00
ticticboooom
0238e31d48 some jei bug fixes 2021-05-19 20:47:49 +01:00
ticticboooom
d226d54200 removed wiki as it is in the web docs repo now 2021-05-18 11:47:42 +01:00
ticticboooom
8b4f234cb2 Merge remote-tracking branch 'origin/master' 2021-05-18 11:20:58 +01:00
ticticboooom
4372b4214d reverting to forge mappings from mojmap 
adding create and pncr ports
 2021-05-18 11:20:49 +01:00
MasterSloth1
b33a4cbbff added more images to gallery 2021-05-18 17:17:59 +12:00
MasterSloth1
c9dd43f19e added image, 
sorted gallery
 2021-05-18 02:49:26 +12:00
ticticboooom
04849d3aa7 added pncr ports functional 2021-05-17 11:07:19 +01:00
ticticboooom
fda62f36d1 started new texture assignations. 
fixed port max-int issues
started TERD usage for jei machine structure integration
 2021-05-17 08:00:45 +01:00
ticticboooom
abdeb540c3 added texture overrides and some wiki content 2021-05-16 19:47:16 +01:00
ticticboooom
115010410f loaded wiki 2021-05-16 01:06:55 +01:00
ticticboooom
f47ebe5659 Merge branch 'master' of github.com:TicTicBoooom-Mods/MasterfulMachinery 2021-05-16 01:02:38 +01:00
ticticboooom
963e36771c changing the docs navigation buttons 2021-05-16 01:02:07 +01:00
MasterSloth
27eaeba0d9 Merge branch 'master' of https://github.com/TicTicBoooom-Mods/MasterfulMachinery 
# Conflicts:
#	wiki_src/config/_default/menus.toml
#	wiki_src/static/images/screenshot.png
 2021-05-16 11:38:44 +12:00
MasterSloth
d787a95aaf added images and gallery 2021-05-16 11:29:03 +12:00
ticticboooom
5c52a1aa99 added some stuff for wiki 2021-05-16 00:25:49 +01:00
ticticboooom
3c8df09147 fixed energy slot rendering on EVERYTHING 2021-05-15 23:00:15 +01:00
ticticboooom
ffa691273e fixing some bugs and adding to wiki 2021-05-15 19:45:20 +01:00
ticticboooom
6d6bca3e16 wiki update 2021-05-15 03:20:20 +01:00
ticticboooom
4f92159643 sorting wiki folders out 2021-05-15 03:16:43 +01:00
ticticboooom
67b568788a Merge remote-tracking branch 'origin/master' 2021-05-15 03:15:01 +01:00
ticticboooom
812ba89058 moving wiki to /docs 2021-05-15 03:14:53 +01:00
TicTicBoooom
25893ead50 Delete CNAME 2021-05-15 03:13:23 +01:00
TicTicBoooom
0aa7c4baa6 Create CNAME 2021-05-15 03:13:17 +01:00
ticticboooom
d7a4ece5fa added chanced io with jei support (fixed) 
added wiki site
 2021-05-15 03:10:51 +01:00