Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-26 04:59:23 +01:00
Code Issues Projects Releases Wiki Activity
2903 commits 15 branches 6 tags 33 MiB
Commit graph

2363 commits

Author SHA1 Message Date
Flanks255
c6f226c2da mining lens part 2. 2022-08-31 12:07:18 -05:00
Flanks255
7251e3390c Go go mining lens recipes, part 1. 2022-08-30 17:20:32 -05:00
Flanks255
a7ea216a03 no more freezing. 2022-08-29 17:18:31 -05:00
Flanks255
648ff8b771 Laser length... lol 2022-08-26 16:19:21 -05:00
Flanks255
0965c430c3 Misc 2022-08-26 08:09:34 -05:00
Flanks255
904c408c94 Color lens time. 2022-08-17 10:29:31 -05:00
Flanks255
8d62396155 Color changing, part 3 2022-08-10 17:33:07 -05:00
Flanks255
9f1e664c08 Color changing, part 2 2022-08-10 17:11:09 -05:00
Flanks255
f5f154b898 Color changing, round 1. 2022-08-03 16:48:00 -05:00
Flanks255
48a2734161 nothing to see here... 2022-07-27 13:34:00 -05:00
Flanks255
011834c732 Colorful lasers 2022-07-27 13:06:26 -05:00
Flanks255
70b0131f88 goodbye arrays of float arrays... 2022-07-06 12:14:19 -05:00
Flanks255
26dfa7cb75 More cleaning and yeeting. 2022-06-24 14:38:07 -05:00
Flanks255
2538de7a4f More lens fixes. 2022-06-24 14:23:43 -05:00
Flanks255
ec8cb4888c now lasers work up and down, whoops. 2022-06-22 17:14:11 -05:00
Flanks255
59785c4d1c more cleaning. 2022-06-18 10:53:23 -05:00
Flanks255
87b1e12892 energy things... 2022-06-12 17:13:33 -05:00
Flanks255
768b677e41 even moar refactoring. 2022-06-05 16:02:36 -05:00
Flanks255
35bf265618 moar refactoring. 2022-06-05 15:36:27 -05:00
Flanks255
123b5b1810 some cleaning, refactoring, and starting work on the coffee machine. 2022-06-05 15:30:25 -05:00
Flanks255
ab672f6474 Moved sounds to deferred. 
Moved sounds to datagen.
Fixed sounds in the reconstructor.
 2022-05-18 15:39:49 -05:00
Flanks255
21a57f2ac9 yeet 2022-04-24 14:54:46 -05:00
Flanks255
a8ab7e8ed8 Lots of fixes, lang fixes, recipe fixes, etc 2022-04-23 12:49:25 -05:00
Flanks255
e8e57ec14e More Yeeting 2022-04-20 12:06:54 -05:00
Flanks255
f420f6e63d things 2022-04-11 16:50:35 -05:00
Flanks255
ab58e7344c Yeet 2022-04-11 16:10:47 -05:00
Flanks255
e0c2bfe9c4 Removed disruption lens. 
added Ell's checklist.
 2022-04-11 15:49:01 -05:00
Flanks255
f6797386fa (Sad FE Noises) 2022-04-11 15:40:47 -05:00
Flanks255
660e976a1f 1st pass at the fluid placer and collector. 2022-04-09 13:11:27 -05:00
Flanks255
ce972eb1f3 breaker breaks. 2022-04-03 19:12:40 -05:00
Flanks255
30e8137c04 placer works... the breaker tho... 2022-04-03 15:18:46 -05:00
Flanks255
327fdc5c3b Drop it like its hot... ill show myself out thank you... 2022-04-03 13:36:07 -05:00
Flanks255
9bb1105c7c more oil generator work. 2022-04-02 16:56:22 -05:00
Flanks255
538d77c831 something something oil generator >_> 2022-04-02 16:41:52 -05:00
Flanks255
ff27e16bc1 Typo in crystallized. 
Phase 1 working to oil generator.
 2022-04-01 21:50:39 -05:00
Flanks255
db00cb34d4 Empowerer go brrrr 2022-04-01 17:51:55 -05:00
Michael Hillcox
b0c1e8e8cc fix: teleport staff to the correct location 🤦 2022-03-13 19:46:58 +00:00
Michael Hillcox
fdda08b593 fix: name of config classes (bad flanks), fixed drill crashing 2022-03-13 19:29:06 +00:00
Flanks255
ec2606f470 Fixed farmer energy display. 2022-02-15 19:41:49 -06:00
Flanks255
80b3d7b64f Just display stand things... 2022-02-15 19:36:31 -06:00
Flanks255
68528b651f please sir... no more rendering... 2022-02-12 10:27:49 -06:00
Flanks255
92b0fed4d5 1st pass at fixing reconstructor... 2022-01-18 19:11:23 -06:00
Flanks255
a8ba206b27 Fermenting JEI Plugin baby... 2022-01-16 12:54:17 -06:00
Flanks255
4cfef87a60 Ferment that oil... 2022-01-15 12:38:00 -06:00
Flanks255
20a5dc1712 Magical seeds oh my... 2022-01-09 11:58:55 -06:00
Flanks255
2707b69d7a Farmer goes brrrr 2022-01-09 11:01:49 -06:00
Flanks255
1a3f223a4b fixing coal generator production to 20rf/t. 
Cleaning up the furnace tile a bit.
 2022-01-09 10:18:45 -06:00
Flanks255
af4f3c3c08 i think all the crops work? 2022-01-08 17:10:34 -06:00
Flanks255
6f2ec8ed4a crops crops crops, canola atleast... 2022-01-08 12:54:43 -06:00
Flanks255
21ca731de1 fluid renders properly now... 2022-01-06 18:59:06 -06:00
Flanks255
66132ecdba OK, the bucket logic is... "better". 
Renders fluid now...
 2022-01-06 18:40:19 -06:00
Flanks255
99521c64a1 well the press... almost works... 2022-01-06 17:16:37 -06:00
Flanks255
ebb9200957 Fluids... how do they even work... 2022-01-05 11:31:40 -06:00
Flanks255
48a6f86eb3 powered furnace done? 2022-01-02 10:58:59 -06:00
Flanks255
7357f5b045 Fixed Button to tile packet. 2022-01-02 10:40:49 -06:00
Flanks255
38daf28115 Something something powered furnace. 2022-01-01 13:28:15 -06:00
Flanks255
0e48b0444d pushing progress... 2021-12-30 11:30:01 -06:00
Flanks255
5f1c68f31f EnergyDisplay on coalgen 2021-12-28 20:40:18 -06:00
Flanks255
c6c232d648 More porting, cleaning up ui code. 
Coal generator seems to work...
 2021-12-28 20:36:23 -06:00
Flanks255
4cb639a94a First pass at the coal generator, and its backing "solid_fuel" json recipes. 2021-12-19 11:27:43 -06:00
Flanks255
0867a55f49 fixed more blocks and things. 2021-11-26 18:21:01 -06:00
Flanks255
7d536b06ba beats me 2021-11-26 16:52:59 -06:00
Flanks255
d89e113705 Fixed walls. 2021-11-25 17:51:59 -06:00
Flanks255
7fc62e5b77 bah, it mostly works. 2021-11-25 15:46:56 -06:00
Flanks255
468dca5797 more things 2021-11-25 14:27:45 -06:00
Flanks255
404feeb00e blocks render! 2021-11-24 12:59:05 -06:00
Flanks255
326ddd770c random jei plugin stuff... 2021-11-24 12:26:45 -06:00
Flanks255
be84dc69a9 fixed problem in crusher datagen. 
Fixed solidified xp.
 2021-11-24 12:19:31 -06:00
Flanks255
925590f70d fixed special render. 2021-11-24 11:11:58 -06:00
Flanks255
f4f5ee91ad first pass at item model gens 2021-11-24 10:57:31 -06:00
Flanks255
268f311e7e whoops, flipped recipe builder arguments... 2021-11-23 19:40:55 -06:00
Flanks255
a188fa240f flattened the specialpeople list. 2021-11-23 19:17:41 -06:00
Flanks255
89cd8d7ec0 slowly but surely. 2021-11-23 18:17:37 -06:00
Flanks255
4617d363c9 SOME datagens moved over, still needs alot of work. 2021-11-23 16:42:12 -06:00
Flanks255
22dfab04a6 empowering recipe modifiers now an array. 2021-11-22 15:58:18 -06:00
Michael Hillcox
57951deea5 feat: recipes! fixed: data gens 2021-11-21 21:38:48 +00:00
Michael Hillcox
674e000e2b fix: lang, stopped worldsave crashing 2021-11-21 21:21:07 +00:00
Michael Hillcox
ae22d44755 fix: rip 2021-11-21 21:04:10 +00:00
Michael Hillcox
295a46626d fix: all the issues! 2021-11-21 21:03:07 +00:00
Flanks255
654a001990 Tweaks 2021-11-21 14:45:33 -06:00
Michael Hillcox
40f9a7ec46 fix: remaining issues 2021-11-21 20:34:08 +00:00
Flanks255
ac3551061d COMPILE 2021-11-21 14:18:00 -06:00
Flanks255
eb3072bcbe ?! 2021-11-21 14:05:27 -06:00
Michael Hillcox
b3a00f8d4e fix: rings 2021-11-21 20:02:08 +00:00
Michael Hillcox
3980b8dc46 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-21 19:57:32 +00:00
Michael Hillcox
5236744941 fix: yeet solar furnace? 2021-11-21 19:57:27 +00:00
Flanks255
b6406c7adc Under 100. 2021-11-21 13:49:33 -06:00
Michael Hillcox
4273fdd0f5 fix: yeet method handler methods for booklet until the booklet is added back 2021-11-21 18:33:57 +00:00
Flanks255
eccf77dd54 something something crusher screen is done i think... 2021-11-21 11:36:46 -06:00
Flanks255
01ee39973a So many errors.... 2021-11-21 10:57:50 -06:00
Flanks255
4b57b9fb45 So many errors... 2021-11-21 10:31:57 -06:00
Flanks255
789570e25d Whittling away at configs... part 1. 2021-11-14 12:18:07 -06:00
Flanks255
d3780c5011 So much porting... 2021-11-13 17:20:29 -06:00
Flanks255
a6b359e1a7 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-13 13:30:11 -06:00
Flanks255
97e6b9c0db Datagenned paxels / equipment. 
added Netherite paxel.
 2021-11-13 13:29:59 -06:00
Michael Hillcox
d922cbdc9e feat: hmm, more porting 2021-11-13 19:09:55 +00:00
Michael Hillcox
05d64c1539 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-11-13 18:31:28 +00:00
Michael Hillcox
f19fa61229 fix: finished util classes and removed booklet 2021-11-13 18:30:58 +00:00
Flanks255
7089cda9af More cleanup.... 2021-11-13 11:16:25 -06:00
Flanks255
9b93760445 More cleanup... 2021-11-13 11:02:42 -06:00
Flanks255
a0b8a83194 Some more recipe work, crushing recipe might be done? 2021-11-13 10:30:53 -06:00
Flanks255
9b11bf3245 Crushy McCrushRecipeFace 2021-10-24 11:49:48 -05:00
Flanks255
93fdf5a674 Some fluid stuff maybe... 2021-10-24 11:03:33 -05:00
Flanks255
8c1da19930 Misc stuff 2021-10-23 13:17:04 -05:00
Flanks255
f3c30d547d more fixes... 2021-10-21 12:33:19 -05:00
Flanks255
f4c7ea0605 more errors, missed a few 2021-10-17 14:52:49 -05:00
Flanks255
e0c049f900 more errors. 2021-10-17 14:46:26 -05:00
Flanks255
08112ea11c Derp derp 2021-10-16 12:09:59 -05:00
Flanks255
cd37abb4ca Network done for now? 2021-10-16 11:46:41 -05:00
Flanks255
3da868fc29 Some low hanging network fruit. 2021-10-16 08:35:52 -05:00
Flanks255
2a6126a1df Should be all of the empowering recipes. 2021-10-14 14:15:16 -05:00
Flanks255
f105b4c265 Empowering recipe is done, datagen next. 2021-10-13 18:54:14 -05:00
Flanks255
6d1aec9d2e Finished converting the main laser recipes to datagen. 2021-10-13 15:42:48 -05:00
Flanks255
b907f08847 Whoops 2021-10-13 11:47:29 -05:00
Flanks255
26343b77c1 Implemented LaserRecipe... Hopefully... 2021-10-12 22:08:31 -05:00
Flanks255
a881b81237 Missed something. 2021-10-12 21:50:44 -05:00
Flanks255
4b76440fce Fixed recipe class name to more align with previous class. 2021-10-12 16:44:02 -05:00
Flanks255
0e31e1e19f Finished Battery recipes. 2021-10-12 16:26:43 -05:00
Flanks255
984b21632d Added NBT Copying recipe type. 2021-10-12 16:19:47 -05:00
Flanks255
0b61cc082d More recipes done, part 3. 2021-10-06 17:18:02 -05:00
Flanks255
5f0a5f660c Picking away at item recipes, part 2 2021-10-04 18:25:33 -05:00
Flanks255
c9e5ca7ff8 Item Recipe conversion, round 1. 2021-10-02 11:49:11 -05:00
Flanks255
a6cba0f69b Little fixes here and there... 2021-10-02 08:59:42 -05:00
Flanks255
148d05a27d fixed a mapping change error. 2021-10-01 15:59:10 -05:00
Flanks255
87bc236287 Fermenting Barrel should be done for now. 2021-09-30 16:23:56 -05:00
Flanks255
b6e4b5a8b3 Moreeeee fixes... time for bed... 2021-08-30 17:44:39 -05:00
Flanks255
218df0c857 Fixed more classes... 2021-08-30 15:51:41 -05:00
Flanks255
56ec90df99 More fixes, time to sleep... 2021-08-29 19:01:35 -05:00
Flanks255
626df0f7fa Lots of little fixes, nothing to see here... 2021-08-29 18:38:12 -05:00
Michael Hillcox
12cd168a36 fix: more issues, ported item drill upgrade 2021-08-23 11:19:49 +01:00
Michael Hillcox
cb45e86529 fix: issues with merge 2021-08-22 22:40:28 +01:00
Michael Hillcox
ab166cb0e4 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-08-22 22:31:28 +01:00
Michael Hillcox
d89e3f5d1d fix: all the porting :D 2021-08-22 22:19:57 +01:00
Flanks255
db186bcadd Block Reg Refactor part 3: The End... or is it? 2021-08-22 14:33:22 -05:00
Flanks255
a97715b5ef Block Reg Refactor part 2: The Tilening... 2021-08-22 14:09:15 -05:00
Flanks255
ca3cc00b85 Oh god so many blocks... 
Block reg refactor, part 1
 2021-08-22 13:16:04 -05:00
Michael Hillcox
518ee0b4c1 feat: official mappings & updated to FG 5.1+ 2021-08-22 16:09:06 +01:00
Flanks255
11db8c8324 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-08-07 08:54:58 -05:00
Flanks255
e2295894a4 A few more recipes down. 2021-05-09 16:31:24 -05:00
Michael Hillcox
79e8791223 chore: more commenting out 2021-05-09 20:58:05 +01:00
Michael Hillcox
e8b797bac3 feat: helper methods, cleanup and builder fixes 2021-05-05 18:05:24 +01:00
Michael Hillcox
a7c9655586 Merge remote-tracking branch 'origin/1.16' into 1.16 2021-05-05 17:46:10 +01:00
Michael Hillcox
8edd6de4d2 feat: added wrapper for builders in recipes 2021-05-05 17:44:52 +01:00
Flanks255
785c4b7460 Finished the quartz recipes... i think... 
Atomic Reconstructor...
 2021-05-05 11:34:43 -05:00
Flanks255
7ef9492778 Moar recipes.... 2021-05-05 11:15:25 -05:00
Flanks255
354a118a1f More Recipes. 
renamed Ethetic Quartz Blocks.
 2021-05-05 10:21:00 -05:00
Michael Hillcox
420188975e feat: port growth ring, hairball, knife, laser wrench, magnet ring 2021-05-04 18:50:50 +01:00
Michael Hillcox
c87bfb6c94 feat: ported bat wings, solidified experience, resonant rice, probe 2021-05-04 17:47:45 +01:00
Flanks255
2419a0e860 The Great-Renaming continues... 2021-05-02 11:10:21 -05:00
Flanks255
ff86e624b4 Much Renaming... 2021-05-02 10:47:50 -05:00
Flanks255
f655001bb6 Fixed MiscBlock registrations. 2021-05-02 10:14:25 -05:00
Flanks255
80488b501e Initial Block/Item Recipe generator classes. 
Recipes for Battery box / Farmer done.
 2021-05-01 17:51:36 -05:00
Flanks255
0146333e37 TeleStaff "Should" be ready... 2021-05-01 16:05:32 -05:00
Michael Hillcox
62b1859abb chore: SO MUCH PORTING! 2021-04-19 20:20:23 +01:00
Michael Hillcox
cf608e9f16 chore: minor fixes before bed 2021-03-01 20:34:05 +00:00
Michael Hillcox
996bf66a65 chore: ported hairy ball handler :wtf: 2021-03-01 20:30:45 +00:00
Michael Hillcox
86ff9fb641 chore: ported most item constructors... 2021-03-01 20:23:52 +00:00
Michael Hillcox
4919a5cbba chore: minor refactor fixes 2021-03-01 19:58:15 +00:00
Michael Hillcox
dcdac11e2b chore: ported most parts of the Gui's 2021-03-01 19:55:50 +00:00
Michael Hillcox
4dfe0e04bb chore: all blocks ported! 2021-03-01 19:14:50 +00:00
Michael Hillcox
0e4a65354f chore: some blocks ported and INamedProviders added to tiles 2021-03-01 17:46:12 +00:00
Michael Hillcox
fcb150ebaf chore: containers ported mostly, gui's ported for comparability 2021-03-01 17:11:34 +00:00
Michael Hillcox
cb650b6689 chore: utils mostly ported, misc ported, deprecation's added, specials ported mostly 2021-03-01 16:25:30 +00:00
Michael Hillcox
6f34f82f4e chore: so much block porting 2021-02-28 14:47:54 +00:00
Michael Hillcox
97bc966606 chore: a few blocks, containers, etc ported over 2021-02-28 11:33:01 +00:00
Michael Hillcox
d39cdb5de8 chore: renders ported, blocks now ActuallyBlocks, removed requested blocks 2021-02-28 10:35:10 +00:00
Michael Hillcox
d25e2fdea3 chore: gui & booklet porting 2021-02-27 21:59:18 +00:00
Michael Hillcox
a200f9aa6a chore: porting work, api package ported, micro ports here and there 2021-02-27 21:44:00 +00:00
Michael Hillcox
e0391bbf87 chore: item porting work 2021-02-27 20:24:26 +00:00
Michael Hillcox
7cd34c5360 chore: minor porting and removing files 2021-02-27 16:35:21 +00:00
Michael Hillcox
32f7a3915f chore: blocks & micro porting 2021-02-27 16:22:03 +00:00
Michael Hillcox
71ddbd9abb chore: ported over most tile entities 2021-02-27 15:33:00 +00:00
Michael Hillcox
ecb7832738 chore: moved over most tile and block register to deferred variant 2021-02-27 12:24:45 +00:00
Michael Hillcox
b7d4d600fc chore: large refactors to new mappings 2021-02-26 21:15:48 +00:00
Michael Hillcox
e0c3024400
Merge pull request #1345 from jammehcow/bugfix/1332 
Fix bounding box NPE when placing worm item
 2020-11-20 16:39:06 +00:00
Cranky Supertoon
1726dac78f
Finish Crystal Flux Localization 
Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
 2020-11-15 12:12:10 -05:00
Cranky Supertoon
26650447de
Finish Crystal Flux Localization 
Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
 2020-11-15 12:10:12 -05:00
Ell
9a15bee50f fixed 1.12 maven publish 2020-11-07 14:38:30 +01:00
James Upjohn
2fcca318fd
Pass zero-sized bounding box to EntityWorm#setEntityBoundingBox 2020-11-07 13:11:12 +13:00
Brennan Ward
02bda56ecb Disable enchanting coffee 2019-11-09 15:02:42 -05:00
TomyLobo
c5010c5d02 Cache slot count (#1289) 
This avoids having to recalculate it every time .getSlots() is called.
The private method getItemHandlerInfos was rendered useless by this change and has been removed.

Fixed #1288
 2019-11-08 16:22:08 -05:00
iTitus
35a048de3d Add config values for Leaf & Coal Generators. Closes #1277 (#1286) 2019-11-08 12:07:11 -05:00
Brennan Ward
158fe22c8e Closes #1275 2019-08-29 18:51:29 -04:00
Brennan Ward
5a013dba79 Closes #1274 2019-08-29 18:48:02 -04:00
Brennan Ward
f12e83a4d0 Closes #1278 2019-08-29 18:44:13 -04:00
Shadows_of_Fire
a296419857 Closes #1269 again™️ 2019-07-25 19:11:49 -04:00
Shadows_of_Fire
4d97a943fa Closes #1266 2019-07-09 01:38:24 -04:00
Shadows_of_Fire
132b71f4a1 Closes #1269 2019-07-08 22:51:10 -04:00
Shadows_of_Fire
a0ae761660 Closes #1268 2019-07-08 22:51:05 -04:00
Shadows_of_Fire
29011db610 add a forge dep 2019-05-18 14:40:53 -04:00
Shadows_of_Fire
0b0530abaa Closes #1255 2019-05-18 14:16:27 -04:00
Shadows_of_Fire
9e2cfa2770 remove UTF8 BOM that was here somehow 2019-05-02 04:47:21 -04:00
Shadows_of_Fire
ded3877b41 rerun the formatter 2019-05-02 04:43:27 -04:00
Shadows_of_Fire
f18f148ff3 Closes #1244 2019-05-02 04:17:02 -04:00
Shadows_of_Fire
673b4bf52a Closes #1245 2019-05-02 03:54:52 -04:00
Shadows_of_Fire
474a7874ec Closes #1237 2019-05-02 03:39:05 -04:00
Shadows_of_Fire
66718437d9 Closes #1239 2019-05-02 03:32:05 -04:00
Shadows_of_Fire
785dccbed8 Merge remote-tracking branch 'origin/master' 2019-05-02 03:14:12 -04:00
Matiss
34ef9d89de Closes #1167 2019-05-02 03:13:05 -04:00
Shadows_of_Fire
274c53a014 Format so style is finally consistent. 2019-05-02 03:10:29 -04:00