Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-25 00:18:34 +01:00
Code Issues Projects Releases Wiki Activity
3143 commits 14 branches 4 tags 33 MiB
Commit graph

2782 commits

Author SHA1 Message Date
Flanks255
72e29bf696 bysco fixes, no more worm errors... 2023-01-15 16:42:43 -06:00
Flanks255
db9b199d76 Updated Forge. 
Updated JEI.
Fixed some log spam.
 2023-01-15 15:46:42 -06:00
Flanks255
860215e7c1 Battery box stuff. 2023-01-15 11:14:29 -06:00
Flanks255
44effd2e7a Coffee fixes. 
Batbox stuff.
 2023-01-15 10:56:02 -06:00
Flanks255
6263e819ab Goggles. 2023-01-14 17:26:59 -06:00
Flanks255
a03036e9db Goggles. 2023-01-14 17:26:37 -06:00
Flanks255
8dd0e1a951 Leaf blowers are done. 2023-01-14 16:02:33 -06:00
Flanks255
750d2649c8 More missing recipes and lang entries. 2023-01-08 17:35:39 -06:00
Flanks255
44ab9291e7 Recipes and lang stuff... 2023-01-07 14:54:54 -06:00
Flanks255
d62d833178 Empowerer Plugin 2022-12-30 19:06:33 -06:00
Flanks255
177370a6a5 JEI Laser plugin. 2022-12-30 18:24:21 -06:00
Flanks255
90b1675764 more recipes. 2022-12-30 16:37:16 -06:00
Flanks255
215cd50608 some crafting recipes. 2022-12-29 18:02:38 -06:00
Michael Hillcox
9d6415e2f8 feat: added (wip) to all non-complete items 2022-11-06 21:17:56 +00:00
Flanks255
86a89a96a8 first pass at functional crusher. 2022-10-19 13:04:42 -05:00
Flanks255
04714de062 fixed furnace for now. 2022-10-19 12:15:46 -05:00
Flanks255
120721564e Crushers and furnaces keep energy. 
Fixed crusher crash.
 2022-10-19 09:57:56 -05:00
Flanks255
e8fee61c91 More tiles storing energy... 2022-10-14 18:58:04 -05:00
Flanks255
ffb11ca5f3 Helper for later block entities loot tables. 2022-10-12 19:13:18 -05:00
Flanks255
6825fa3d4a Atomic Reconstructor fixes, saves energy when mined, also saves redstone mode, and restores on placement, more to come. 2022-10-12 17:49:01 -05:00
Flanks255
c15fbab60b Implemented Reconstructor random tooltips 2022-10-08 12:26:24 -05:00
Flanks255
773d723ce0 more laser things. 2022-09-01 18:26:54 -05:00
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
6dce5e29ac crops crops crops, canola atleast... 2022-01-08 12:54:51 -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
14c42e6d57 powered furnace done? 2022-01-02 11:03:34 -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
4d8f76a463 Phantom Rendering. 2021-11-26 21:44:15 -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
62754fc72d fiddled with lang. 2021-11-25 17:55:54 -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
8f86e9a9a9 stashed old assets, moved new assets over from rewrite. 2021-11-22 16:30:34 -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
286946e29f fix: name 2021-11-21 20:36:18 +00: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
Michael Hillcox
0a0dc76b88
Merge pull request #1340 from Falcion/patch-1 
Updated Russian translation.
 2020-11-20 16:38:52 +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
Falcion
b0083669fa
Added Russian translation. 
* Updated Actually Additions Manual (full);
* Updated some other item's, block's and etc translation;
* Moved word games, sayings (Russian-language sayings and word games) in achievements, manual;
 2020-08-25 13:55:23 +03: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
ThetaDev
b409090ec4 Updated german translation (#1285) 
Updated the german language file to latest version and translated everything but the manual pages.
 2019-10-13 12:02:49 -04: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
Shadows_of_Fire
95a25dbfc4 Update to new forge rarity system 2019-05-02 03:08:15 -04:00
Shadows_of_Fire
1ce4d21159 Closes #1092 2019-05-02 03:08:06 -04:00
Shadows_of_Fire
a866ecac23 Closes #1194 2019-03-03 17:24:25 -05:00
Shadows_of_Fire
45cef1b4cf Closes #1210 2019-03-03 17:10:05 -05:00
shejery
bfee6a1a24 Add ko_KR.lang 2019-03-03 17:07:37 -05:00
Shadows_of_Fire
d4f98090d1 Partially address #1067 
I'll deal with the rest of them when eclipse text search works
 2019-02-27 14:51:41 -05:00
Shadows_of_Fire
a8371154ec Closes #953 2019-02-27 14:42:38 -05:00
Shadows_of_Fire
0d8f38710e Auto cleanup 2019-02-27 13:53:05 -05:00
Shadows_of_Fire
82020bcd49 refactor event registration 2019-02-27 13:44:38 -05:00
Jacob Pearson
753c1a4478 Closes Ellpeck#1225 (#1227) 2019-02-22 01:22:51 -05:00
Jacob Pearson
30b594c16b Closes Ellpeck#1230 (#1231) 
Fix solid experience dropping when doMobLoot is set to false
 2019-02-22 01:22:13 -05:00
Shadows_of_Fire
345c7a4817 Closes #1211 2019-02-06 16:15:47 -05:00
Shadows_of_Fire
9e6ae26b59 Closes #1204 2019-02-06 16:12:16 -05:00
Shadows_of_Fire
1ef95a76c9 gthub pls 2019-02-06 15:32:03 -05:00
Shadows_of_Fire
289c1de017 Closes #1222 2019-02-06 15:31:52 -05:00
Shadows_of_Fire
06ca0ad4cd Fix Filters Closes #1209 2019-02-06 15:27:38 -05:00
Shadows_of_Fire
7fe79f09be Closes #1214 2019-02-06 15:01:37 -05:00
Sir-Will
81a988811b Cache KittyVanCat UUID (#1216) 
Moved `UUID.fromString()` to a field as it currently runs it on every LivingUpdate which is unnecessary here.

![](https://i.imgur.com/BauHelP.jpg)
 2019-02-06 14:45:30 -05:00
Shadows_of_Fire
6e46026e68 r144 
also update jei deprecations
 2018-12-11 01:18:31 -05:00
Shadows_of_Fire
ebda3195bb Closes #1195 2018-10-28 13:52:26 -04:00
Shadows_of_Fire
2786022b26 Closes #1198 2018-10-28 13:38:26 -04:00
Shadows_of_Fire
e9cbf2dd85 Closes #1191 2018-10-16 19:41:40 -04:00
Shadows_of_Fire
f24c0b7705 Closes #1185 2018-10-05 02:19:07 -04:00
Shadows_of_Fire
df374a42de Don't crash if we hit the void 2018-10-05 02:06:39 -04:00
Shadows_of_Fire
0a76d0a070 Closes #1183 2018-10-05 02:05:19 -04:00
Brennan Ward
e9e3b14c6a mods be sketchy 2018-09-27 17:54:07 -04:00
Brennan Ward
f585d814ce Significant performance boost for Coal Gen (#1184) 
Needs testing.
 2018-09-27 15:17:23 -04:00
Brennan Ward
7b44cec1dc Closes #1180 2018-09-26 13:19:25 -04:00
Shadows_of_Fire
1d5aa47085 Closes #1166 2018-09-26 04:02:42 -04:00
Shadows_of_Fire
33ccc7ead7 Closes #1168 
If it doesnt, well, I don't think I can do anything about other mods
generating in that space;  maybe move it to the deco event.
 2018-09-26 03:56:33 -04:00
Shadows_of_Fire
e282f56928 Closes #1174 2018-09-26 03:53:48 -04:00
Shadows_of_Fire
1240287b3b Closes #1177 2018-09-26 02:59:22 -04:00
Shadows_of_Fire
1cca640345 Closes #1178 2018-09-26 02:52:40 -04:00
Shadows_of_Fire
9db46b9efc Closes #1159 2018-08-12 10:44:35 -04:00
Shadows_of_Fire
33d9cb9fdb properly fix #1157 2018-08-09 23:04:07 -04:00
Shadows_of_Fire
234167f7ad Closes #1157 2018-08-05 15:39:36 -04:00
Shadows_of_Fire
f7bebeec7b Closes #1156 2018-08-03 22:34:52 -04:00
Shadows_of_Fire
08d0e8b7fb Update mappings 2018-08-03 22:22:20 -04:00
Shadows_of_Fire
32716bfca9 Closes #1154 2018-07-27 21:40:36 -04:00
Shadows_of_Fire
7c7e87bea4 remove bad 2018-07-27 20:48:26 -04:00
Shadows_of_Fire
6c10642832 Closes #1152 2018-07-27 20:45:50 -04:00
Shadows_of_Fire
f476e47a46 Closes #1150 2018-07-27 20:11:58 -04:00
Shadows_of_Fire
1bec4bbff7 Closes #1145 2018-07-27 20:08:42 -04:00
Shadows_of_Fire
f59c431649 Fix up farmer behaviors 2018-07-27 20:05:33 -04:00
Rick
7a5b1dcd1c Update en_US.lang (#1107) 
I discovered that the application of the Storage Chest Upgrade requires a sneak-right-click rather than a shift-right-click.
Also, the Upgrade works on Quark chests, which are wooden, but not Iron Chests, which are non-wood. Wasn't sure if I described it very well, but I thought it was a start.
 2018-07-11 03:35:25 -04:00
Shadows_of_Fire
a10999736a unregister the update checker after finishing 
since this is a tick handler keeping it registered is probably a bad
idea.
 2018-07-10 19:10:26 -04:00
Shadows_of_Fire
2584bb9cf4 Closes #1143 2018-07-09 23:40:41 -04:00
Shadows_of_Fire
8649106d22 am forgot 2018-07-08 04:31:26 -04:00
Shadows_of_Fire
71d5d52462 Closes #1142 2018-07-07 06:07:22 -04:00
Shadows_of_Fire
3df0738429 imporps 2018-07-07 05:38:33 -04:00
Shadows_of_Fire
fb6cedbb71 remove legacy load 2018-07-07 05:35:39 -04:00
Shadows_of_Fire
61e3f2c9fe betr cod 2018-07-04 03:29:27 -04:00
Shadows_of_Fire
bdd87c621c Closes #1137 2018-06-29 16:32:33 -04:00
Shadows_of_Fire
3953c8b3b2 Properly send these events 2018-06-28 18:24:51 -04:00
Shadows_of_Fire
85038e9628 english u stupid shit 2018-06-27 03:23:55 -04:00
Shadows_of_Fire
29534764a9 Closes #1134 2018-06-26 16:25:51 -04:00
Shadows_of_Fire
709b75a043 Fix empowerer; Closes #1130 2018-06-24 14:35:50 -04:00
Shadows_of_Fire
6a46513844 Closes #1128 2018-06-23 22:25:27 -04:00
Shadows_of_Fire
6a02e54888 Closes #1115 2018-06-23 21:23:58 -04:00
Shadows_of_Fire
5c149648da More major updating 
Migrates the rest of the recipe system to Ingredient inputs, Migrates
the compost to an IBakedModel instead of a TESR
 2018-06-23 20:44:47 -04:00
Shadows_of_Fire
5bbca0ee30 Fix count of 2 in ghost slots 2018-06-23 13:27:08 -04:00
Shadows_of_Fire
0b4a870717 Closes #1125 2018-06-23 12:39:59 -04:00
Shadows_of_Fire
06b6511663 Closes #1123 2018-06-23 12:37:41 -04:00
Shadows_of_Fire
00c0c507ca Closes #1121 2018-06-22 22:24:32 -04:00
Shadows_of_Fire
ac2bc0124a We're just gonna hope nothing is on fire. 2018-06-22 19:39:30 -04:00
Shadows_of_Fire
a571c70457 Closes #1073 
This fix means there is a clear underlying issue with the inventory
structure of AA...  This is going to be quite a big refactor.  Bleh.
 2018-05-31 16:41:13 -04:00
Shadows_of_Fire
dca3098631 Closes #1104 2018-05-31 15:29:55 -04:00
Shadows_of_Fire
2595cac472 Closes #1106 
Performance doesn't just show up but maybe these are faster.
 2018-05-31 15:22:02 -04:00
Shadows_of_Fire
54b4f946ea meta is wrong 
n ur code bad bcuz it use meta
 2018-05-21 16:07:03 -04:00
Shadows_of_Fire
37753694f6 Closes #1095 
Probably, anyway, the crash didn't really make sense to begin with, but
this is written like 900x better anyhow.
 2018-05-21 16:02:23 -04:00
Shadows_of_Fire
6eab779e81 Closes #1086 2018-05-10 05:51:20 -04:00
Shadows_of_Fire
3d253aab3e Closes #1078 2018-05-10 05:41:56 -04:00
Shadows_of_Fire
0a1d976ce0 refactor has forgotten u apparently but u fix now 2018-05-10 05:40:16 -04:00
Shadows_of_Fire
505cdc349f reorganized some constants 2018-05-10 05:38:58 -04:00
Shadows_of_Fire
dfd54486a3 Closes #1083 2018-05-05 04:01:54 -04:00
Shadows_of_Fire
047c69473b Closes #1084 2018-05-05 03:49:50 -04:00
Konstantin
7608a3af3d Create ru_RU.lang (#1079) 
MC 1.12.2. ActuallyAdditions r134. Sources file - en_US.lang (1260 lines) = ru_RU.lang (1260 lines).
 2018-04-27 02:35:32 -04:00
Shadows_of_Fire
b1f913a347 Closes #1064 
apparently we was missin some _
 2018-04-19 20:08:05 -04:00
Shadows_of_Fire
e38178daaf oil genrtr 2018-04-14 13:54:08 -04:00
Shadows_of_Fire
b91bde4d74 Closes #1061 2018-04-13 13:19:52 -04:00
Shadows_of_Fire
981a0c6ae1 Closes #1072 2018-04-13 12:47:34 -04:00
Shadows_of_Fire
76263a56d9 Probably shouldn't hoe farmland blocks 2018-03-23 19:19:43 -04:00
Ristelle
5b3c3fa46f Updated My own name to reflect new username (#1057) 
Because Using my old username is so 2010.
 2018-03-23 00:27:14 -04:00
Shadows_of_Fire
23aa941579 might assist in #1055 2018-03-23 00:18:57 -04:00
Shadows_of_Fire
54e5cdd5cf remove more meta usage 2018-03-22 23:49:50 -04:00
Shadows_of_Fire
88daf6683d Fixes #1055 2018-03-22 22:53:13 -04:00
Brennan Ward
b0efb95e4d meta r bad 
reeeeeeeeeeeeeeeeeeeeeeeeeee
 2018-03-22 16:58:53 -04:00
Shadows_of_Fire
9aaaeb9ed0 Fixes #1043 
Includes a change that might also resolve #1041 in creative mode, but
that's untested.
 2018-03-19 12:50:18 -04:00
Shadows_of_Fire
8cd9c6a095 Closes #1044 2018-03-19 12:05:28 -04:00
Shadows_of_Fire
8bb71ad796 meta is bad pls 2018-03-19 11:46:43 -04:00
Shadows_of_Fire
3fcebcdd05 Fixes #1051 2018-03-16 19:07:15 -04:00
Ellpeck
349640c07f fuck you 2018-03-13 15:19:52 +01:00
Shadows_of_Fire
e534728d66 coal not ingot 
-tt
 2018-03-13 00:01:52 -04:00
Shadows_of_Fire
532aa1ca60 Add FastBench Compat, closes #1035 2018-03-06 21:08:25 -05:00
Shadows_of_Fire
7fadd4368f nospampls 2018-02-22 12:33:48 -05:00
The_Fireplace
9ace03bb9f Added en_UD.lang (#1032) 
nice
 2018-02-17 19:02:06 -05:00
Shadows_of_Fire
f7c5d9e1e9 Closes #1003 
guis r evil
 2018-02-17 17:00:14 -05:00
Shadows_of_Fire
0507779f60 remove dead config 2018-02-17 16:08:44 -05:00
Shadows_of_Fire
76be3f4fc9 Add atomic reconstructor battery config 
as requested by @Darkosto
The recieve rate is always 0.0166 times the battery size.
 2018-02-17 16:08:40 -05:00
Shadows_of_Fire
890de9e006 fix melon bois ( Closes #1025 ) 2018-02-17 15:59:16 -05:00
Shadows_of_Fire
dc1a2d13b8 meta is bad kthx 2018-02-11 20:51:19 -05:00
Shadows_of_Fire
3a56a962b2 bleh 2018-02-11 19:44:15 -05:00
Shadows_of_Fire
c2209f0596 Not everything is a BlockCrops 2018-01-31 01:46:37 -05:00
Shadows_of_Fire
bfe876f423 Don't cast every IPlantable to BlockBush 2018-01-31 00:07:38 -05:00
Shadows_of_Fire
f5ae3240f8 Fixes #1018 2018-01-31 00:07:29 -05:00
Shadows_of_Fire
f019fbfcda care about horses 2018-01-29 16:43:14 -05:00
Shadows_of_Fire
cd4c1b9d1c big boi's big orders 2018-01-29 16:21:40 -05:00
Shadows_of_Fire
4412c62503 Closes #1014 2018-01-29 03:28:12 -05:00
Shadows_of_Fire
00e99d3611 Smart Feeder Fixes #1017 2018-01-29 03:17:38 -05:00
Shadows_of_Fire
227c227ddd Fixes #1015 
I think.  This is basically the entire method from TiC, with added
boolean returns to support that the drill wanted them.  Probably also
Fixes #996
 2018-01-29 02:17:31 -05:00
Shadows_of_Fire
9670fc7669 check for deny 2018-01-26 02:34:20 -05:00
Shadows_of_Fire
287e43c6ad Fix #1010 2018-01-20 13:39:03 -05:00
dalapo
82de1c3dd2 Add extra null check to canFillFluidType (#1006) 
Prevents crashes when canFillFluidType(null) is called
 2018-01-17 13:22:55 -05:00
Shadows_of_Fire
4e30e7bb3b Fixes #988 2018-01-15 17:15:29 -05:00
Shadows_of_Fire
bf451dceb1 Fixes #1005 (removes a debug sysout) 2018-01-15 17:00:32 -05:00
Shadows_of_Fire
b21089ad6b Fixes #995 2018-01-14 13:25:36 -05:00
Shadows_of_Fire
f17f982dab remov import 2018-01-12 17:48:21 -05:00
Shadows_of_Fire
c5dbd778bb git forgot this 2018-01-12 17:47:01 -05:00
Shadows_of_Fire
426b363f8e clarity on oil recipe numbers 2018-01-12 17:46:38 -05:00
canitzp
31b3eaaf30 Redone some old code, tile entities are now saving their nbt to the itemstack again, also the MeeCreeps integration does work now Closes #998 2018-01-05 14:38:06 +01:00
Shadows_of_Fire
ce8061261b grow some more to account for speed loss 2018-01-04 14:51:19 -05:00
Shadows_of_Fire
beef72d35d remove greenhouse glass tile entity 
I am not sure if this is faster or slower than the old tile entity, but
it certainly is more performant.  Numbers may be adjusted to try and fix
what the old speed was (every 50 ticks)
 2018-01-04 14:40:58 -05:00
Shadows_of_Fire
4493a687ce make aiot accept sword enchantments 2018-01-04 14:27:16 -05:00
Shadows_of_Fire
8a1ed7b14b remove explicit tesla support 
tesla api is ded and this will be more work for 1.13 so rip af
 2017-12-23 15:20:01 -05:00
Shadows_of_Fire
1954da6edb Closes #985 
Actually added a feature for once! (Enchanted book splitting)
Added a transformHook in LensConversionRecipe
Made the booklet have max stack size of 1
Moved the text over a bit on reconstructor recipe pages
 2017-12-12 01:54:15 -05:00
leomil72
9388605e24 Italian localization (#986) 
Added Italian localization
 2017-12-12 00:16:43 -05:00
Shadows_of_Fire
348b1eb92c Better check 2017-12-06 16:25:10 -05:00
Shadows_of_Fire
213716fc46 Block harvesting until tema uses new getDrops 2017-12-06 15:59:18 -05:00
Shadows_of_Fire
da573459cb Update state when dropper gui closes (fixes #972) 2017-12-02 13:38:36 -05:00
Shadows_of_Fire
2a751355d7 Adds Sack Blacklist (Closes #974) 
also apparently the common capabilities maven is throwing 403's so i've
set it to the version in my cache.
 2017-12-01 16:19:52 -05:00
Shadows_of_Fire
872e124cd8 bleh 2017-11-30 11:13:58 -05:00
Shadows_of_Fire
3bbf2c3d4a Ensure holding of the sack. Closes #975 2017-11-30 02:58:30 -05:00
tartaric_acid
ea06819f38 Update zh_CN language file for 1.12 (#976) 
* Complete part of the translation.

* finish zh_CN language file update

* fix a typo
 2017-11-30 02:48:58 -05:00
Shadows_of_Fire
0d6adca7c7 <> is illegal 2017-11-20 11:46:07 -05:00
Mike Botsko
bb1568afbc Fixes typo in biomash manual (#966) 2017-11-17 14:04:46 -05:00
Mike Botsko
a23b0a2378 Fixes typo in lens of disenchanting manual 2017-11-16 19:00:55 -08:00
Shadows_of_Fire
9bed6f7ea5 no more lamp sneak 2017-11-15 18:11:17 -05:00
Brennan Ward
6ded1cc7b3
BAD NULL 
remov null via mobil
 2017-11-03 13:37:21 -04:00
Shadows_of_Fire
856d62f78c remov null 2017-11-02 17:49:53 -04:00
Shadows_of_Fire
e95da124f1 touch up jei handler 2017-10-31 18:31:34 -04:00
Shadows_of_Fire
585777b9e0 Closes #885 2017-10-31 18:01:15 -04:00
Artemish
aaedc88953 Added Compost recipes to JEI 2017-10-30 21:19:48 -05:00
Shadows_of_Fire
05e37320ba Don't pickup things from conveyor belts 2017-10-23 13:08:17 -04:00
Shadows_of_Fire
100b10eb7a no more display stand torches bleh 2017-10-05 18:36:35 -04:00
Shadows_of_Fire
19402f3650 Fixes #929 2017-10-05 09:06:26 -04:00
Xander
2f2de97bf2 don't return internal copy of itemstack on simulate 2017-10-01 13:05:47 +08:00
Shadows_of_Fire
2f505dc24a Fixes #932 2017-09-29 22:47:10 -04:00
Shadows_of_Fire
75f9b17154 fix it for real this time 2017-09-25 15:54:53 -04:00
Shadows_of_Fire
dcd8f5207b Fixes #928 2017-09-24 14:32:24 -04:00
Shadows_of_Fire
db7daa3343 Closes #884 2017-09-23 02:16:10 -04:00
Shadows_of_Fire
562f0c07e6 Closes #922 2017-09-23 01:55:01 -04:00
Shadows_of_Fire
1fe930b395 switch to new getDrops method 
If this causes issues, its on other people's end to resolve it.  They
should stop overriding the old one.  But, this is basically asking for
trouble.
 2017-09-17 02:47:04 -04:00
Shadows_of_Fire
e8058e252a y tho 2017-09-13 12:50:12 -04:00
Shadows_of_Fire
cf8e1bbf56 Closes #912 2017-08-30 12:28:35 -04:00
Shadows_of_Fire
1abb89c512 Closes #911 2017-08-27 21:12:20 -04:00
Shadows_of_Fire
65482ada4a doot 2017-08-24 01:02:52 -04:00
Shadows_of_Fire
1e817c3fa9 Fixes #904 finally, probably for the last time 
Also deduplicates multiple entries of say 1 iron ore to LITERALLY EVERY
IRON DUST because that was stupid and just clutter.
 2017-08-24 01:00:33 -04:00
Shadows_of_Fire
fa25cbf7b0 Magnet ring now only works in survival/adventure; Closes #903 2017-08-22 20:06:34 -04:00
Shadows_of_Fire
22f9f4440e Closes #904 2017-08-22 20:01:54 -04:00
Shadows_of_Fire
6ef76a16ea more deprecation things, mainly moving away from all uses of getStateFromMeta 
Changes in LensColor, LensMining, and MethodHandler might all catch on
fire, idk.
i checked them and they worked tho so blahr
 2017-08-17 01:06:09 -04:00
Shadows_of_Fire
2d3e90068f Closes #891 
probably, anyway, idk what weights other mods are using tho so whatever
 2017-08-16 05:42:22 -04:00
Shadows_of_Fire
e44b13c554 Closes #886 2017-08-11 18:15:09 -04:00
Shadows_of_Fire
2239a8a783 More deprecation stuffs 
1.13 will remove metadata so expect a few more of these for the remainig
getStateFromMeta stuff... Hopefully this doesn't set anything on fire
 2017-08-09 12:20:55 -04:00
Shadows_of_Fire
ed736f3c66 final touch on #881 2017-08-08 15:03:24 -04:00
Shadows_of_Fire
f9d226cfc9 Closes #881 
Now, this doesn't really work, because putting power in the
reconstructor doesn't cause a block update.  But it exists, and it'll
try its hardest.  But i'm not making the power input cause a block
update.
 2017-08-08 14:28:30 -04:00
Shadows_of_Fire
9aed16c52a Closes #878 
These are vanilla items blargh
 2017-08-08 11:05:44 -04:00
Shadows_of_Fire
daefd71504 important 2017-08-08 08:02:04 -04:00
Shadows_of_Fire
2ee695359c Fixes #880 
probably, anyway
 2017-08-08 08:01:28 -04:00
Shadows_of_Fire
64e6df805b how 2 police 2017-08-06 04:29:28 -04:00