AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,379 Commits 29 Branches 143 Tags
Commit Graph

1379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c3bdbefc46 Make sure to register oredict entries after item registration, confuses some mods otherwise. 2014-05-18 01:06:48 +02:00
Florian Nücke
28a3f54f89 Made angel upgrade use an event. 
Added missing recomputation trigger for RAM and component counts.
 2014-05-17 19:06:39 +02:00
Florian Nücke
34c2fef670 Made OpenOS loot disk a separate item to avoid confusing NEI and item costs. 
Made loot disks to show up in NEI.
Validate inventory before starting assembly.
 2014-05-17 17:50:21 +02:00
Florian Nücke
5c5e858c3d Some localization. 
Removed robot recipes.
Some fixes here and there.
 2014-05-17 15:11:22 +02:00
Florian Nücke
a5a8833288 Fixed glitchiness when starting robot assembly. 2014-05-17 12:37:03 +02:00
Florian Nücke
c938aa47ef Fixed tier derp, adjusted slot count and in robots. 
Switched upgrade icons back.
 2014-05-17 03:00:54 +02:00
Florian Nücke
50ea74ddee Robot assembler textures and renderer. 2014-05-17 02:35:24 +02:00
Florian Nücke
452bda0a9c Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 
Conflicts:
	src/main/scala/li/cil/oc/CraftingHandler.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
 2014-05-16 14:37:43 +02:00
Florian Nücke
0bdcea8e3c Fixed potential NPE. 
Bump version.
v1.2.10 		2014-05-16 14:17:04 +02:00
Florian Nücke
a579a3792f Removed the bucket consumption in acid/grog crafting and bucket retrieval in PCB crafting. Kind of meh because the grog now is in a magical container that disappears instead of the bucket, logically speaking, but it avoids issues - in particular this closes #194. 2014-05-16 00:48:51 +02:00
Florian Nücke
2e649a3f44 Workaround for TMI screwing with the GuiContainer class. Should fix #251. 2014-05-16 00:42:24 +02:00
Florian Nücke
365475e2c5 Properly handling conversion of tables with null keys or values. Closes #254. 2014-05-16 00:03:29 +02:00
Florian Nücke
48b50c9d27 Progress bar for robot assembly, blocking slot in assembler while assembling. 
Some checks for robot inventory slots in GUI if there are fewer than 16 inventory slots.
Not showing item costs prompt for uncraftable items and blocks.
Some tier icon related rendering fixes.
Fixed analyzer costs not showing in tooltip.
 2014-05-15 23:46:15 +02:00
Florian Nücke
43566955a2 Better shift-click transfer logic for inventories (slot based, not inventory based). 
Force initializing components before sending them to the client.
 2014-05-15 15:10:31 +02:00
Florian Nücke
86c41ef69a More work on robot assembly and modularity. 2014-05-15 13:02:44 +02:00
Florian Nücke
6f580eaf0a Merge pull request #255 from JoshTheEnder/patch-1 
Standardized usage message in irc.lua.
 2014-05-15 12:49:05 +02:00
Josh
7f877d63e1 Updated irc.lua; change the output of required.... 
args to make the fact that you need a nickname more prominent
 2014-05-14 13:46:02 +01:00
Florian Nücke
15354b2dd5 Finished ROM removal, looking for bootable device now. 
Moved OpenOS to loot disk, made it craftable.
 2014-05-12 17:21:34 +02:00
Florian Nücke
7c689f1351 Clearing slots in robot assembler when case is removed / other case is inserted that doesn't support the item in the slot. 
Added localizations for new items.
 2014-05-12 13:52:07 +02:00
Florian Nücke
33e680d197 Card and upgrade container upgrade items. 2014-05-12 02:32:01 +02:00
Florian Nücke
dae9c15a0a Introduced tiers to robot upgrades. 
Starting on robot assembler block.
 2014-05-11 22:56:04 +02:00
Florian Nücke
0b47150e4b Merge pull request #250 from SpiritedDusty/patch-3 
fixes #249
 2014-05-07 16:28:44 +02:00
SpiritedDusty
ccacfc430a fixes #249 2014-05-06 20:11:06 -07:00
Florian Nücke
f2798786c0 Started to modularize robots, making experience an upgrade and introducing a bunch of events. 2014-05-07 03:43:23 +02:00
Florian Nücke
9264d3c3d0 Documented new API some more. 
Fixed values returned from gpu.get.
Added parameter for vertical gpu.set.
 2014-05-06 11:40:11 +02:00
Florian Nücke
e7c7ad31e6 Massive refactoring and redesign of how screens work, adding them to the API to allow re-use... to my huge surprise it seems to actually work so far. Rendering and some other parts will need some cleanup now. 
Added environment creation method to item drivers that takes an entity instead of a tile entity, which might at some point be used for entity-based computers (e.g. more advanced robots, portable computers, ...)
Removed gpu.getSize, added screen.getAspectRatio.
I'm kind of afraid of merging this into the 1.7 branch... conflicts ahoy.
 2014-05-05 21:45:48 +02:00
Florian Nücke
6d8e5dd841 Merge pull request #246 from bananagram/patch-1 
Fix a typo in the wget usage summary.
 2014-05-05 12:53:40 +02:00
bananagram
25ed64221a Fix a typo in the usage summary 2014-05-04 19:03:39 -05:00
Florian Nücke
859716b77c Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 2014-05-02 13:34:36 +02:00
Florian Nücke
867f602183 Minor refactoring. 2014-05-02 13:25:55 +02:00
Florian Nücke
e1eaeb0e60 Made driver lookup available in the API. 2014-05-02 13:17:16 +02:00
Florian Nücke
2cea730d3d Added Geolyzer block, returns hardness of blocks in a segment of a column of blocks per scan. Useful for generating holograms of the world and detecting minerals. 
Some cleanup and refactoring.
 2014-05-02 00:47:13 +02:00
Florian Nücke
e82f3af04d Finished Linked Card implementation (point-to-point unlimited but energy extensive communication, including across dimensions). 
Some changes to crafting, introducing custom recipe class to perform changes to crafted items (setting NBT data), because the crafting handler is not supposed to be used that way, apparently. WARNING: Breaks navigation upgrades!
Added size getter to network packets.
 2014-05-01 21:24:51 +02:00
Florian Nücke
366fb98b10 Merge pull request #243 from Vexatos/patch-4 
Created `note` API to allow note name based use of `computer.beep()`.
 2014-04-30 17:59:29 +02:00
Vexatos
9dc2d2833b Update note.lua 2014-04-30 17:57:08 +02:00
Vexatos
9de638e884 Some tweaks 2014-04-30 17:50:26 +02:00
Vexatos
20c1c1ac0a Created note API 
Functionality:
* `note.midi(n: number or string)`: Converts a note in string form (e.g. A#4 or Gb3, will be documented on the wiki) or a given frequency into the respective MIDI code
* `note.freq(n: number or string)`: Converts a note in string form (e.g. A#4) or a given MIDI code into the respective frequency
* `note.get(n: number)`: Converts a MIDI value back into a string; if you have a frequency to convert, just use note.get(note.midi(frequency))
* `note.ticks(n: number)`: Converts note block ticks (0-24) into MIDI code (34-58, respectively) and vice-versa. Useful for use with note blocks and OpenComponents
* `note.play(tone: string or number,duration: number)`: Plays a note from a string or MIDI code via computer.beep
 2014-04-30 17:28:15 +02:00
Florian Nücke
6579c19e29 Cleaned up Items class - a lot. Mainly thanks to dogfooding the new Items API now. 
Changed many OreDict entry names to be simpler and more consistent, adjusted recipes, hopefully didn't miss anything. Who am I kidding. Surely missed something.
Cleaned up blocks a little, too. Not that much, yet, because direct access is still needed by renderers for textures.
 2014-04-30 16:25:53 +02:00
Florian Nücke
bb7dd9e966 Merge branch 'master' of github.com:MightyPirates/OpenComputers v1.2.9 2014-04-30 12:54:27 +02:00
Florian Nücke
09911a8d2d Bumping version number for MC1.7 hotfix, to keep version numbers synchronized. 2014-04-30 12:54:01 +02:00
Florian Nücke
bbff237d9d Merge pull request #240 from Techokami/master 
Further improved irc.lua, better display for actions, computer.beep() when nick is mentioned.
 2014-04-29 21:13:03 +02:00
Techokami
1e3e0db7ce More irc.lua cleanup 
OC doesn't like to render tabs! Use spaces instead :)
 2014-04-29 15:08:17 -04:00
Techokami
3090f95a11 Further improved irc.lua 
Proper displaying of /me commands, and audio notification if your name
is said in chat (using the computer.beep() command)
 2014-04-29 14:57:33 -04:00
Florian Nücke
b1cab2e35c Tier two hologram with tricolor display (defaults to red, green, blue, can be changed individually). 
Changed the looks of the hologram block a little.
Broke backwards compatibility in the hologram API, makes it more easily usable and was more or less required for colors anyway.
 2014-04-29 17:50:41 +02:00
Florian Nücke
1694c10dfb Some more work on userdata, allowing @Callback annotations and such, following same calling conventions as components. 
Made internet card's HTTP request return a userdata value that wraps the request and can be polled using read().
 2014-04-28 20:27:53 +02:00
Florian Nücke
17c31591dd Adjusted default palette for 4 bit so that component.gpu.setForeground(colors.green, true) works as expected. 
Fixed some scripts setting colors not saving the palette flag of the old color.
 2014-04-28 14:17:57 +02:00
Florian Nücke
31ad516c25 Palette fixes and making the palette mutable (can set palette colors from Lua). 2014-04-28 14:04:13 +02:00
Florian Nücke
e0b35d4729 Basic implementation for new color system (6x8x5 for 8 bit, 16 grayscale palette, pure 16 color palette for 4 bit). 2014-04-28 03:38:49 +02:00
Christopher Trumbour
ed9c9f7a2c Merge pull request #2 from MightyPirates/master 
Syncronization
 2014-04-27 19:24:34 -04:00
Florian Nücke
f36835511a Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 2014-04-28 00:24:23 +02:00