Commit Graph

238 Commits

Author SHA1 Message Date
ThePython 40cf7088da Decaychains and stonecutter now work 2023-11-27 15:02:12 -08:00
ThePython 72b84587aa Merge remote-tracking branch 'origin/MoreManualStuff' into dev 2023-11-26 14:25:00 -08:00
ThePython10110 8c277cc130 More 2023-11-26 07:24:45 -08:00
ThePython10110 cb428c46a2 Automatic coral
(this branch exists because I'm using a different computer and forgot to
push my changes on my main one).
2023-11-24 15:51:46 -08:00
ThePython ceaf25fa4f Random commit 2023-11-23 09:48:11 -08:00
ThePython 7064d4e2a4 Trying to make stonecutter work 2023-11-23 09:17:53 -08:00
ThePython 5ed7c7e92f thingsnstuff 2023-11-22 10:36:16 -08:00
ThePython 362310b041 Merge branch 'main' into dev 2023-11-21 13:47:55 -08:00
ThePython 6395f791e8 v5.4 2023-11-21 13:31:33 -08:00
ThePython 0be468496b Merge branch 'main' into dev 2023-11-21 13:27:50 -08:00
ThePython ad73cdefe7 Energy values now match ProjectE better 2023-11-21 13:26:27 -08:00
ThePython 2b5fad975a
Merge pull request #9 from programmerjake/fix-energy-collector
Fix error where energy_collector.lua tries to compare to nil
2023-11-21 13:22:04 -08:00
Jacob Lifshay 399bb14528
Fix error where energy_collector.lua tries to compare to nil 2023-11-20 23:54:58 -08:00
ThePython 7aae74608f Added some textures; don't like chest textures. 2023-11-20 12:35:10 -08:00
ThePython 9290294154 Added pipeworks support (closes #8) 2023-11-20 09:17:17 -08:00
ThePython 9c9c620b84 Hoppers work now, among other things. 2023-11-19 16:01:56 -08:00
ThePython 3874c608f3 Improvements and aliases 2023-11-18 16:48:35 -08:00
ThePython 3c8345da1b Technic works, hoppers don't yet 2023-11-12 17:30:16 -08:00
ThePython 15645ebeec Readme edit 2023-11-10 14:47:57 -08:00
ThePython d5e62aa99e Merge branch 'main' into dev 2023-11-10 14:45:49 -08:00
ThePython 7fb4724961 Readme edit 2023-11-10 14:45:30 -08:00
ThePython bb3e694f4f Finished automatic energy values! (I hope) 2023-11-10 14:43:10 -08:00
ThePython cb0f322668 Merge branch 'main' into dev 2023-11-09 19:00:54 -08:00
ThePython 074c964573 v5.3 (fixes #6) 2023-11-09 18:55:50 -08:00
ThePython 81b374223b Automatic energy values MOSTLY work. 2023-11-09 18:35:23 -08:00
ThePython 37d30ebe65 Merge branch 'automatic-energy-values' into dev 2023-11-07 18:13:38 -08:00
ThePython e7f7907146 Auto energy values work (mostly) 2023-11-07 18:00:09 -08:00
ThePython 67dca136e9
5.2 2023-11-07 17:51:34 -08:00
ThePython 2f6f2a6388 Working on baubles 2023-11-07 16:02:24 -08:00
ThePython e1d856d62b Still testing 2023-11-02 17:29:17 -07:00
ThePython 3fa283b956 Fix a couple of things, add comments 2023-11-02 17:24:26 -07:00
ThePython 281b2a90df Couple of things 2023-11-02 16:53:52 -07:00
ThePython a683beb709 Giving up for now. 2023-11-02 16:33:30 -07:00
ThePython 3821ae518c Merge branch 'main' into dev 2023-10-30 16:59:32 -07:00
ThePython cd5bd99269 v5.2 2023-10-30 16:56:30 -07:00
ThePython a3f72e5b0f Converted to modpack 2023-10-30 16:54:59 -07:00
ThePython 1b8b640142 Fix readme 2023-10-30 15:44:41 -07:00
ThePython 024ff88dd6 v5.1 2023-10-30 15:42:11 -07:00
ThePython 5c38408d16
Update README.md 2023-10-11 07:18:35 -07:00
ThePython 4708b59092 v5.0 2023-10-08 14:12:25 -07:00
ThePython 7204d4956f Done except energy values 2023-10-07 08:26:21 -07:00
ThePython 8e80a15c10 Update Wiki (apparently) 2023-10-05 17:22:20 -07:00
ThePython fa58fd436b Finished furnaces, redone (de)constructors 2023-10-05 17:19:48 -07:00
ThePython c71e07eef4 Still doin that thing 2023-10-03 17:08:07 -07:00
ThePython 5e9ca823af Still working on furnaces/collectors 2023-10-03 17:07:36 -07:00
ThePython f3b2fd14e7
Update bug_report.md 2023-09-28 17:33:42 -07:00
ThePython 551d4a7459
Update issue templates 2023-09-28 17:32:43 -07:00
ThePython fdb9dd9054
Update CODE_OF_CONDUCT.md 2023-09-28 17:19:48 -07:00
ThePython 8152dd296d
Update CONTRIBUTING.md 2023-09-28 17:19:29 -07:00
ThePython f2ba6ca59f
Create CONTRIBUTING.md 2023-09-28 17:18:45 -07:00